Update from 1.0.0-stable.

diff --git a/ssl/ssl.h b/ssl/ssl.h
index 09385a660391c029408ff19e3ede5fe2beb41243..8f1cf1cc8f4065fec2ac49de52af73cd6e0cd237 100644 (file)
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -1580,6 +1580,9 @@ int SSL_set_purpose(SSL *s, int purpose);
 int SSL_CTX_set_trust(SSL_CTX *s, int trust);
 int SSL_set_trust(SSL *s, int trust);
 
 int SSL_CTX_set_trust(SSL_CTX *s, int trust);
 int SSL_set_trust(SSL *s, int trust);
 

+int SSL_CTX_set1_param(SSL_CTX *ctx, X509_VERIFY_PARAM *vpm);
+int SSL_set1_param(SSL *ssl, X509_VERIFY_PARAM *vpm);
+

 void   SSL_free(SSL *ssl);
 int    SSL_accept(SSL *ssl);
 int    SSL_connect(SSL *ssl);
 void   SSL_free(SSL *ssl);
 int    SSL_accept(SSL *ssl);
 int    SSL_connect(SSL *ssl);

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 7b911ae1eac610d591688c174f45e14651dc3c92..49f8ca46d1d2ba637548dd9e3550227c7e4e8674 100644 (file)
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -486,6 +486,16 @@ int SSL_set_trust(SSL *s, int trust)
        return X509_VERIFY_PARAM_set_trust(s->param, trust);
        }
 
        return X509_VERIFY_PARAM_set_trust(s->param, trust);
        }
 

+int SSL_CTX_set1_param(SSL_CTX *ctx, X509_VERIFY_PARAM *vpm)
+       {
+       return X509_VERIFY_PARAM_set1(ctx->param, vpm);
+       }
+
+int SSL_set1_param(SSL *ssl, X509_VERIFY_PARAM *vpm)
+       {
+       return X509_VERIFY_PARAM_set1(ssl->param, vpm);
+       }
+

 void SSL_free(SSL *s)
        {
        int i;
 void SSL_free(SSL *s)
        {
        int i;