diff options
| author | jkim <jkim@FreeBSD.org> | 2016-05-03 18:50:10 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2016-05-03 18:50:10 +0000 |
| commit | 00a878d06ed0d3bdfbf6339ef29f6cc94fd47ced (patch) | |
| tree | 64905eaaef6c163463b7acbaca1a9724913735f5 /crypto/openssl/ssl/ssl_locl.h | |
| parent | c052df1347dcbd00de507acf0cfa03733e795db5 (diff) | |
| parent | acb827e3083196de4c00b67ac9ae3bf860ffd4a9 (diff) | |
| download | FreeBSD-src-00a878d06ed0d3bdfbf6339ef29f6cc94fd47ced.zip FreeBSD-src-00a878d06ed0d3bdfbf6339ef29f6cc94fd47ced.tar.gz | |
Merge OpenSSL 1.0.2h.
Relnotes: yes
Diffstat (limited to 'crypto/openssl/ssl/ssl_locl.h')
| -rw-r--r-- | crypto/openssl/ssl/ssl_locl.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/crypto/openssl/ssl/ssl_locl.h b/crypto/openssl/ssl/ssl_locl.h index a8e4efc..747e718 100644 --- a/crypto/openssl/ssl/ssl_locl.h +++ b/crypto/openssl/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 { |
