diff options
| author | Matt Caswell <matt@openssl.org> | 2017-06-12 13:30:21 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-06-21 14:45:35 +0100 |
| commit | 9368f86526d9feb1f511fab9c0eee8e8dc869b87 (patch) | |
| tree | b10c253f6a3f118a4009ecfc3120cfec403d2d54 /include/openssl | |
| parent | 3a7c56b2c0e6680e4ad3d83387a970110efdf1ba (diff) | |
| download | openssl-9368f86526d9feb1f511fab9c0eee8e8dc869b87.zip openssl-9368f86526d9feb1f511fab9c0eee8e8dc869b87.tar.gz openssl-9368f86526d9feb1f511fab9c0eee8e8dc869b87.tar.bz2 | |
Add TLSv1.3 client side external PSK support
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3670)
Diffstat (limited to 'include/openssl')
| -rw-r--r-- | include/openssl/ssl.h | 4 | ||||
| -rw-r--r-- | include/openssl/sslerr.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index 2dfa7f6..41edb38 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -767,6 +767,10 @@ typedef int (*SSL_psk_find_session_cb_func)(SSL *ssl, const unsigned char *identity, size_t identity_len, SSL_SESSION **sess); +typedef int (*SSL_psk_use_session_cb_func)(SSL *ssl, const EVP_MD *md, + const unsigned char **id, + size_t *idlen, + SSL_SESSION **sess); void SSL_CTX_set_psk_server_callback(SSL_CTX *ctx, SSL_psk_server_cb_func cb); void SSL_set_psk_server_callback(SSL *ssl, SSL_psk_server_cb_func cb); diff --git a/include/openssl/sslerr.h b/include/openssl/sslerr.h index 8dfc974..540baff 100644 --- a/include/openssl/sslerr.h +++ b/include/openssl/sslerr.h @@ -381,6 +381,7 @@ int ERR_load_SSL_strings(void); # define SSL_R_BAD_LENGTH 271 # define SSL_R_BAD_PACKET_LENGTH 115 # define SSL_R_BAD_PROTOCOL_VERSION_NUMBER 116 +# define SSL_R_BAD_PSK 219 # define SSL_R_BAD_PSK_IDENTITY 114 # define SSL_R_BAD_RECORD_TYPE 443 # define SSL_R_BAD_RSA_ENCRYPT 119 |