This commit was manufactured by cvs2svn to create branch

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

diff --git a/ssl/ssl_rsa.c b/ssl/ssl_rsa.c
index 72511d248bd0173e47967bfdbe455529f596de3a..fb0bd4d0452af081459fc86cfb17112c26e5616d 100644 (file)
--- a/ssl/ssl_rsa.c
+++ b/ssl/ssl_rsa.c
@@ -131,7 +131,7 @@ end:
        }
 #endif
 
-int SSL_use_certificate_ASN1(SSL *ssl, const unsigned char *d, int len)
+int SSL_use_certificate_ASN1(SSL *ssl, unsigned char *d, int len)
        {
        X509 *x;
        int ret;
@@ -382,10 +382,10 @@ end:
        }
 #endif
 
-int SSL_use_PrivateKey_ASN1(int type, SSL *ssl, const unsigned char *d, long len)
+int SSL_use_PrivateKey_ASN1(int type, SSL *ssl, unsigned char *d, long len)
        {
        int ret;
-       const unsigned char *p;
+       unsigned char *p;
        EVP_PKEY *pkey;
 
        p=d;
@@ -545,7 +545,7 @@ end:
        }
 #endif
 
-int SSL_CTX_use_certificate_ASN1(SSL_CTX *ctx, int len, const unsigned char *d)
+int SSL_CTX_use_certificate_ASN1(SSL_CTX *ctx, int len, unsigned char *d)
        {
        X509 *x;
        int ret;
@@ -640,7 +640,7 @@ end:
        }
 #endif
 
-int SSL_CTX_use_RSAPrivateKey_ASN1(SSL_CTX *ctx, const unsigned char *d, long len)
+int SSL_CTX_use_RSAPrivateKey_ASN1(SSL_CTX *ctx, unsigned char *d, long len)
        {
        int ret;
        const unsigned char *p;
@@ -717,11 +717,11 @@ end:
        }
 #endif
 
-int SSL_CTX_use_PrivateKey_ASN1(int type, SSL_CTX *ctx, const unsigned char *d,
+int SSL_CTX_use_PrivateKey_ASN1(int type, SSL_CTX *ctx, unsigned char *d,
             long len)
        {
        int ret;
-       const unsigned char *p;
+       unsigned char *p;
        EVP_PKEY *pkey;
 
        p=d;
@@ -804,7 +804,7 @@ int SSL_CTX_use_certificate_chain_file(SSL_CTX *ctx, const char *file)
                /* When the while loop ends, it's usually just EOF. */
                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();
+                       ERR_clear_error();
                else 
                        ret = 0; /* some real error */
                }