Commit 6fe43af8 authored by Richard Levitte's avatar Richard Levitte
Browse files

Revert "Use the callbacks from the SSL object instead of the SSL_CTX object" 



This shouldn't have been applied to the 1.0.2 branch.

This reverts commit 5247c038.

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2907)
parent 2b194874

ssl/ssl_rsa.c

+8 −6
Original line number Diff line number Diff line
@@ -102,8 +102,8 @@ int SSL_use_certificate_file(SSL *ssl, const char *file, int type) 
        x = d2i_X509_bio(in, NULL);

    } else if (type == SSL_FILETYPE_PEM) {

        j = ERR_R_PEM_LIB;

        x = PEM_read_bio_X509(in, NULL, ssl->default_passwd_callback,

                              ssl->default_passwd_callback_userdata);

        x = PEM_read_bio_X509(in, NULL, ssl->ctx->default_passwd_callback,

                              ssl->ctx->default_passwd_callback_userdata);

    } else {

        SSLerr(SSL_F_SSL_USE_CERTIFICATE_FILE, SSL_R_BAD_SSL_FILETYPE);

        goto end;
@@ -261,8 +261,9 @@ int SSL_use_RSAPrivateKey_file(SSL *ssl, const char *file, int type) 
    } else if (type == SSL_FILETYPE_PEM) {

        j = ERR_R_PEM_LIB;

        rsa = PEM_read_bio_RSAPrivateKey(in, NULL,

                                         ssl->default_passwd_callback,

                                         ssl->default_passwd_callback_userdata);

                                         ssl->ctx->default_passwd_callback,

                                         ssl->

                                         ctx->default_passwd_callback_userdata);

    } else {

        SSLerr(SSL_F_SSL_USE_RSAPRIVATEKEY_FILE, SSL_R_BAD_SSL_FILETYPE);

        goto end;
@@ -334,8 +335,9 @@ int SSL_use_PrivateKey_file(SSL *ssl, const char *file, int type) 
    if (type == SSL_FILETYPE_PEM) {

        j = ERR_R_PEM_LIB;

        pkey = PEM_read_bio_PrivateKey(in, NULL,

                                       ssl->default_passwd_callback,

                                       ssl->default_passwd_callback_userdata);

                                       ssl->ctx->default_passwd_callback,

                                       ssl->

                                       ctx->default_passwd_callback_userdata);

    } else if (type == SSL_FILETYPE_ASN1) {

        j = ERR_R_ASN1_LIB;

        pkey = d2i_PrivateKey_bio(in, NULL);