Use an OCTET STRING for the encoding of an OCSP nonce value.

[oweals/openssl.git] / ssl / ssl_rsa.c

diff --git a/ssl/ssl_rsa.c b/ssl/ssl_rsa.c
index 80d9f798123cff9a835858141c11cb243a0891f5..330390519bb6a9dd2390eacba8c6745b9316ce10 100644 (file)
--- a/ssl/ssl_rsa.c
+++ b/ssl/ssl_rsa.c
@@ -57,12 +57,12 @@
  */
 
 #include <stdio.h>
+#include "ssl_locl.h"
 #include <openssl/bio.h>
 #include <openssl/objects.h>
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
-#include "ssl_locl.h"
 
 static int ssl_set_cert(CERT *c, X509 *x509);
 static int ssl_set_pkey(CERT *c, EVP_PKEY *pkey);
@@ -170,7 +170,7 @@ int SSL_use_RSAPrivateKey(SSL *ssl, RSA *rsa)
                return(0);
                }
 
-       CRYPTO_add(&rsa->references,1,CRYPTO_LOCK_RSA);
+       RSA_up_ref(rsa);
        EVP_PKEY_assign_RSA(pkey,rsa);
 
        ret=ssl_set_pkey(ssl->cert,pkey);
@@ -207,7 +207,7 @@ static int ssl_set_pkey(CERT *c, EVP_PKEY *pkey)
                         ok=1;
                else
 #endif
-                       if (!X509_check_private_key(c->pkeys[i].x509,pkey))
+                    if (!X509_check_private_key(c->pkeys[i].x509,pkey))
                        {
                        if ((i == SSL_PKEY_DH_RSA) || (i == SSL_PKEY_DH_DSA))
                                {
@@ -241,6 +241,8 @@ static int ssl_set_pkey(CERT *c, EVP_PKEY *pkey)
                return(0);
                }
 
+       ERR_clear_error(); /* make sure no error from X509_check_private_key()
+                           * is left if we have chosen to ignore it */
        if (c->pkeys[i].privatekey != NULL)
                EVP_PKEY_free(c->pkeys[i].privatekey);
        CRYPTO_add(&pkey->references,1,CRYPTO_LOCK_EVP_PKEY);
@@ -582,7 +584,7 @@ int SSL_CTX_use_RSAPrivateKey(SSL_CTX *ctx, RSA *rsa)
                return(0);
                }
 
-       CRYPTO_add(&rsa->references,1,CRYPTO_LOCK_RSA);
+       RSA_up_ref(rsa);
        EVP_PKEY_assign_RSA(pkey,rsa);
 
        ret=ssl_set_pkey(ctx->cert, pkey);
@@ -800,9 +802,9 @@ int SSL_CTX_use_certificate_chain_file(SSL_CTX *ctx, const char *file)
                         * by SSL_CTX_use_certificate). */
                        }
                /* When the while loop ends, it's usually just EOF. */
-               err = ERR_peek_error();
+               err = ERR_peek_last_error();
                if (ERR_GET_LIB(err) == ERR_LIB_PEM && ERR_GET_REASON(err) == PEM_R_NO_START_LINE)
-                       (void) ERR_get_error();
+                       (void)ERR_get_error();
                else 
                        ret = 0; /* some real error */
                }