Fix unused variable warning of GCC

[openssl.git] / ssl / ssl_rsa.c

diff --git a/ssl/ssl_rsa.c b/ssl/ssl_rsa.c
index 3a7b8d3c361cf07b51691e04e69f999adc446b1e..a8a62f1b04004b1ef87553cb93380930fde4b2b6 100644 (file)
--- a/ssl/ssl_rsa.c
+++ b/ssl/ssl_rsa.c
@@ -1,5 +1,5 @@
 /* ssl/ssl_rsa.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
@@ -99,6 +99,7 @@ X509 *x;
        return(ssl_set_cert(c,x));
        }
 
+#ifndef NO_STDIO
 int SSL_use_certificate_file(ssl, file, type)
 SSL *ssl;
 char *file;
@@ -109,11 +110,7 @@ int type;
        int ret=0;
        X509 *x=NULL;
 
-#ifdef WIN16
-       in=BIO_new(BIO_s_file_internal_w16());
-#else
-       in=BIO_new(BIO_s_file());
-#endif
+       in=BIO_new(BIO_s_file_internal());
        if (in == NULL)
                {
                SSLerr(SSL_F_SSL_USE_CERTIFICATE_FILE,ERR_R_BUF_LIB);
@@ -122,7 +119,6 @@ int type;
 
        if (BIO_read_filename(in,file) <= 0)
                {
-               SYSerr(SYS_F_FOPEN,errno);
                SSLerr(SSL_F_SSL_USE_CERTIFICATE_FILE,ERR_R_SYS_LIB);
                goto end;
                }
@@ -154,6 +150,7 @@ end:
        if (in != NULL) BIO_free(in);
        return(ret);
        }
+#endif
 
 int SSL_use_certificate_ASN1(ssl, len, d)
 SSL *ssl;
@@ -232,7 +229,20 @@ EVP_PKEY *pkey;
 
        if (c->pkeys[i].x509 != NULL)
                {
-               if (!X509_check_private_key(c->pkeys[i].x509,pkey))
+               EVP_PKEY_copy_parameters(
+                       X509_get_pubkey(c->pkeys[i].x509),pkey);
+               ERR_clear_error();
+
+#ifndef NO_RSA
+               /* Don't check the public/private key, this is mostly
+                * for smart cards. */
+               if ((pkey->type == EVP_PKEY_RSA) &&
+                       (RSA_flags(pkey->pkey.rsa) &
+                        RSA_METHOD_FLAG_NO_CHECK))
+                        ok=1;
+               else
+#endif
+                       if (!X509_check_private_key(c->pkeys[i].x509,pkey))
                        {
                        if ((i == SSL_PKEY_DH_RSA) || (i == SSL_PKEY_DH_DSA))
                                {
@@ -277,6 +287,7 @@ EVP_PKEY *pkey;
        }
 
 #ifndef NO_RSA
+#ifndef NO_STDIO
 int SSL_use_RSAPrivateKey_file(ssl, file, type)
 SSL *ssl;
 char *file;
@@ -286,11 +297,7 @@ int type;
        BIO *in;
        RSA *rsa=NULL;
 
-#ifdef WIN16
-       in=BIO_new(BIO_s_file_internal_w16());
-#else
-       in=BIO_new(BIO_s_file());
-#endif
+       in=BIO_new(BIO_s_file_internal());
        if (in == NULL)
                {
                SSLerr(SSL_F_SSL_USE_RSAPRIVATEKEY_FILE,ERR_R_BUF_LIB);
@@ -299,7 +306,6 @@ int type;
 
        if (BIO_read_filename(in,file) <= 0)
                {
-               SYSerr(SYS_F_FOPEN,errno);
                SSLerr(SSL_F_SSL_USE_RSAPRIVATEKEY_FILE,ERR_R_SYS_LIB);
                goto end;
                }
@@ -330,6 +336,7 @@ end:
        if (in != NULL) BIO_free(in);
        return(ret);
        }
+#endif
 
 int SSL_use_RSAPrivateKey_ASN1(ssl,d,len)
 SSL *ssl;
@@ -383,6 +390,7 @@ EVP_PKEY *pkey;
        return(ret);
        }
 
+#ifndef NO_STDIO
 int SSL_use_PrivateKey_file(ssl, file, type)
 SSL *ssl;
 char *file;
@@ -392,11 +400,7 @@ int type;
        BIO *in;
        EVP_PKEY *pkey=NULL;
 
-#ifdef WIN16
-       in=BIO_new(BIO_s_file_internal_w16());
-#else
-       in=BIO_new(BIO_s_file());
-#endif
+       in=BIO_new(BIO_s_file_internal());
        if (in == NULL)
                {
                SSLerr(SSL_F_SSL_USE_PRIVATEKEY_FILE,ERR_R_BUF_LIB);
@@ -405,7 +409,6 @@ int type;
 
        if (BIO_read_filename(in,file) <= 0)
                {
-               SYSerr(SYS_F_FOPEN,errno);
                SSLerr(SSL_F_SSL_USE_PRIVATEKEY_FILE,ERR_R_SYS_LIB);
                goto end;
                }
@@ -431,6 +434,7 @@ end:
        if (in != NULL) BIO_free(in);
        return(ret);
        }
+#endif
 
 int SSL_use_PrivateKey_ASN1(type,ssl,d,len)
 int type;
@@ -491,18 +495,31 @@ X509 *x;
        pkey=X509_get_pubkey(x);
        if (pkey == NULL)
                {
-               SSLerr(SSL_F_SSL_SET_PKEY,SSL_R_X509_LIB);
+               SSLerr(SSL_F_SSL_SET_CERT,SSL_R_X509_LIB);
                return(0);
                }
 
        i=ssl_cert_type(x,pkey);
        if (i < 0)
                {
-               SSLerr(SSL_F_SSL_SET_PKEY,SSL_R_UNKNOWN_CERTIFICATE_TYPE);
+               SSLerr(SSL_F_SSL_SET_CERT,SSL_R_UNKNOWN_CERTIFICATE_TYPE);
                return(0);
                }
 
        if (c->pkeys[i].privatekey != NULL)
+               {
+               EVP_PKEY_copy_parameters(pkey,c->pkeys[i].privatekey);
+               ERR_clear_error();
+
+#ifndef NO_RSA
+               /* Don't check the public/private key, this is mostly
+                * for smart cards. */
+               if ((c->pkeys[i].privatekey->type == EVP_PKEY_RSA) &&
+                       (RSA_flags(c->pkeys[i].privatekey->pkey.rsa) &
+                        RSA_METHOD_FLAG_NO_CHECK))
+                        ok=1;
+               else
+#endif
                {
                if (!X509_check_private_key(x,c->pkeys[i].privatekey))
                        {
@@ -527,6 +544,7 @@ X509 *x;
                        }
                else
                        ok=1;
+               } /* NO_RSA */
                }
        else
                ok=1;
@@ -547,6 +565,7 @@ X509 *x;
        return(1);
        }
 
+#ifndef NO_STDIO
 int SSL_CTX_use_certificate_file(ctx, file, type)
 SSL_CTX *ctx;
 char *file;
@@ -557,11 +576,7 @@ int type;
        int ret=0;
        X509 *x=NULL;
 
-#ifdef WIN16
-       in=BIO_new(BIO_s_file_internal_w16());
-#else
-       in=BIO_new(BIO_s_file());
-#endif
+       in=BIO_new(BIO_s_file_internal());
        if (in == NULL)
                {
                SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE_FILE,ERR_R_BUF_LIB);
@@ -570,7 +585,6 @@ int type;
 
        if (BIO_read_filename(in,file) <= 0)
                {
-               SYSerr(SYS_F_FOPEN,errno);
                SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE_FILE,ERR_R_SYS_LIB);
                goto end;
                }
@@ -602,6 +616,7 @@ end:
        if (in != NULL) BIO_free(in);
        return(ret);
        }
+#endif
 
 int SSL_CTX_use_certificate_ASN1(ctx, len, d)
 SSL_CTX *ctx;
@@ -663,6 +678,7 @@ RSA *rsa;
        return(ret);
        }
 
+#ifndef NO_STDIO
 int SSL_CTX_use_RSAPrivateKey_file(ctx, file, type)
 SSL_CTX *ctx;
 char *file;
@@ -672,11 +688,7 @@ int type;
        BIO *in;
        RSA *rsa=NULL;
 
-#ifdef WIN16
-       in=BIO_new(BIO_s_file_internal_w16());
-#else
-       in=BIO_new(BIO_s_file());
-#endif
+       in=BIO_new(BIO_s_file_internal());
        if (in == NULL)
                {
                SSLerr(SSL_F_SSL_CTX_USE_RSAPRIVATEKEY_FILE,ERR_R_BUF_LIB);
@@ -685,7 +697,6 @@ int type;
 
        if (BIO_read_filename(in,file) <= 0)
                {
-               SYSerr(SYS_F_FOPEN,errno);
                SSLerr(SSL_F_SSL_CTX_USE_RSAPRIVATEKEY_FILE,ERR_R_SYS_LIB);
                goto end;
                }
@@ -716,6 +727,7 @@ end:
        if (in != NULL) BIO_free(in);
        return(ret);
        }
+#endif
 
 int SSL_CTX_use_RSAPrivateKey_ASN1(ctx,d,len)
 SSL_CTX *ctx;
@@ -766,6 +778,7 @@ EVP_PKEY *pkey;
        return(ssl_set_pkey(c,pkey));
        }
 
+#ifndef NO_STDIO
 int SSL_CTX_use_PrivateKey_file(ctx, file, type)
 SSL_CTX *ctx;
 char *file;
@@ -775,11 +788,7 @@ int type;
        BIO *in;
        EVP_PKEY *pkey=NULL;
 
-#ifdef WIN16
-       in=BIO_new(BIO_s_file_internal_w16());
-#else
-       in=BIO_new(BIO_s_file());
-#endif
+       in=BIO_new(BIO_s_file_internal());
        if (in == NULL)
                {
                SSLerr(SSL_F_SSL_CTX_USE_PRIVATEKEY_FILE,ERR_R_BUF_LIB);
@@ -788,7 +797,6 @@ int type;
 
        if (BIO_read_filename(in,file) <= 0)
                {
-               SYSerr(SYS_F_FOPEN,errno);
                SSLerr(SSL_F_SSL_CTX_USE_PRIVATEKEY_FILE,ERR_R_SYS_LIB);
                goto end;
                }
@@ -814,6 +822,7 @@ end:
        if (in != NULL) BIO_free(in);
        return(ret);
        }
+#endif
 
 int SSL_CTX_use_PrivateKey_ASN1(type,ctx,d,len)
 int type;