Update OpenSSL to 1.0.1i.

[ffftp/ffftp.git] / contrib / openssl / include / openssl / ssl.h

diff --git a/contrib/openssl/include/openssl/ssl.h b/contrib/openssl/include/openssl/ssl.h
index 6a4a243..29ffd52 100644 (file)
--- a/contrib/openssl/include/openssl/ssl.h
+++ b/contrib/openssl/include/openssl/ssl.h
@@ -264,6 +264,7 @@ extern "C" {
 #define SSL_TXT_aGOST94        "aGOST94"\r
 #define SSL_TXT_aGOST01 "aGOST01"\r
 #define SSL_TXT_aGOST  "aGOST"\r
+#define SSL_TXT_aSRP            "aSRP"\r
 \r
 #define        SSL_TXT_DSS             "DSS"\r
 #define SSL_TXT_DH             "DH"\r
@@ -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);\r
 int SSL_cache_hit(SSL *s);\r
 \r
+#ifndef OPENSSL_NO_UNIT_TEST\r
+const struct openssl_ssl_test_functions *SSL_test_functions(void);\r
+#endif\r
+\r
 /* BEGIN ERROR CODES */\r
 /* The following lines are auto generated by the script mkerr.pl. Any changes\r
  * made after this point may be overwritten when the script is next run.\r
@@ -2320,6 +2325,7 @@ void ERR_load_SSL_strings(void);
 #define SSL_R_BAD_SRP_B_LENGTH                          348\r
 #define SSL_R_BAD_SRP_G_LENGTH                          349\r
 #define SSL_R_BAD_SRP_N_LENGTH                          350\r
+#define SSL_R_BAD_SRP_PARAMETERS                        371\r
 #define SSL_R_BAD_SRP_S_LENGTH                          351\r
 #define SSL_R_BAD_SRTP_MKI_VALUE                        352\r
 #define SSL_R_BAD_SRTP_PROTECTION_PROFILE_LIST          353\r