diff options
| author | jkim <jkim@FreeBSD.org> | 2014-08-07 18:56:10 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2014-08-07 18:56:10 +0000 |
| commit | 3299c3be1ad20ab974be3dd97789e20b68dfa949 (patch) | |
| tree | 466b55a31fe1a87db4dfcbef9e5d2f3e8aec65e1 /crypto/openssl/ssl/ssl.h | |
| parent | c934f5fd2852ea5ed2fcbb043e6cf7316daa7e7e (diff) | |
| parent | 8bd1d6691f94efdce2338dffd823889f6c6b8ed2 (diff) | |
| download | FreeBSD-src-3299c3be1ad20ab974be3dd97789e20b68dfa949.zip FreeBSD-src-3299c3be1ad20ab974be3dd97789e20b68dfa949.tar.gz | |
Merge OpenSSL 1.0.1i.
Diffstat (limited to 'crypto/openssl/ssl/ssl.h')
| -rw-r--r-- | crypto/openssl/ssl/ssl.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/crypto/openssl/ssl/ssl.h b/crypto/openssl/ssl/ssl.h index 4c1242c..b73da5e 100644 --- a/crypto/openssl/ssl/ssl.h +++ b/crypto/openssl/ssl/ssl.h @@ -264,6 +264,7 @@ extern "C" { #define SSL_TXT_aGOST94 "aGOST94" #define SSL_TXT_aGOST01 "aGOST01" #define SSL_TXT_aGOST "aGOST" +#define SSL_TXT_aSRP "aSRP" #define SSL_TXT_DSS "DSS" #define SSL_TXT_DH "DH" @@ -2055,6 +2056,10 @@ int SSL_set_session_secret_cb(SSL *s, tls_session_secret_cb_fn tls_session_secre void SSL_set_debug(SSL *s, int debug); int SSL_cache_hit(SSL *s); +#ifndef OPENSSL_NO_UNIT_TEST +const struct openssl_ssl_test_functions *SSL_test_functions(void); +#endif + /* BEGIN ERROR CODES */ /* The following lines are auto generated by the script mkerr.pl. Any changes * made after this point may be overwritten when the script is next run. @@ -2320,6 +2325,7 @@ void ERR_load_SSL_strings(void); #define SSL_R_BAD_SRP_B_LENGTH 348 #define SSL_R_BAD_SRP_G_LENGTH 349 #define SSL_R_BAD_SRP_N_LENGTH 350 +#define SSL_R_BAD_SRP_PARAMETERS 371 #define SSL_R_BAD_SRP_S_LENGTH 351 #define SSL_R_BAD_SRTP_MKI_VALUE 352 #define SSL_R_BAD_SRTP_PROTECTION_PROFILE_LIST 353 |
