diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-05-04 08:35:35 +0200 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-05-04 08:35:35 +0200 |
| commit | 3279ad79c3dcecbb2c5c001775d7a28f982e0955 (patch) | |
| tree | 2511b58f7b1b50fc0b9b84efa1c29fe25bd7876b /drivers/builtin_openssl2/ssl/ssl_locl.h | |
| parent | 6a4b62e72069f7c96f8b7cb9b7855da0bbd84b63 (diff) | |
| parent | ab623c923d4e2c950342aec5da371cb92b1fbbc6 (diff) | |
Merge pull request #4540 from mrezai/openssl-1.0.2h
Update OpenSSL to 1.0.2h
Diffstat (limited to 'drivers/builtin_openssl2/ssl/ssl_locl.h')
| -rw-r--r-- | drivers/builtin_openssl2/ssl/ssl_locl.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/builtin_openssl2/ssl/ssl_locl.h b/drivers/builtin_openssl2/ssl/ssl_locl.h index a8e4efceba..747e718a52 100644 --- a/drivers/builtin_openssl2/ssl/ssl_locl.h +++ b/drivers/builtin_openssl2/ssl/ssl_locl.h @@ -436,8 +436,9 @@ # define SSL_MEDIUM 0x00000040L # define SSL_HIGH 0x00000080L # define SSL_FIPS 0x00000100L +# define SSL_NOT_DEFAULT 0x00000200L -/* we have used 000001ff - 23 bits left to go */ +/* we have used 000003ff - 22 bits left to go */ /*- * Macros to check the export status and cipher strength for export ciphers. @@ -687,6 +688,10 @@ typedef struct cert_st { custom_ext_methods cli_ext; custom_ext_methods srv_ext; int references; /* >1 only if SSL_copy_session_id is used */ + /* non-optimal, but here due to compatibility */ + unsigned char *alpn_proposed; /* server */ + unsigned int alpn_proposed_len; + int alpn_sent; /* client */ } CERT; typedef struct sess_cert_st { |