diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-23 20:17:10 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-23 20:17:10 +0000 |
| commit | 1b639dab951fb73d5031aa0c1afb13e8480d1dae (patch) | |
| tree | 4e13a4d1e4c609bd01d0bf5d65c6a8acdc3d0c50 /openssl/crypto/asn1/n_pkey.c | |
| parent | 51181fb7f4d135d214974bb6611d51f21475eec8 (diff) | |
| parent | b680cf39ed5bc37e0eb7eb86ad8599bf92df3f2b (diff) | |
| download | vcxsrv-1b639dab951fb73d5031aa0c1afb13e8480d1dae.tar.gz vcxsrv-1b639dab951fb73d5031aa0c1afb13e8480d1dae.tar.bz2 vcxsrv-1b639dab951fb73d5031aa0c1afb13e8480d1dae.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'openssl/crypto/asn1/n_pkey.c')
| -rw-r--r-- | openssl/crypto/asn1/n_pkey.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/openssl/crypto/asn1/n_pkey.c b/openssl/crypto/asn1/n_pkey.c index 60bc43793..e7d043906 100644 --- a/openssl/crypto/asn1/n_pkey.c +++ b/openssl/crypto/asn1/n_pkey.c @@ -242,7 +242,7 @@ RSA *d2i_RSA_NET(RSA **a, const unsigned char **pp, long length, int sgckey) { RSA *ret=NULL; - const unsigned char *p, *kp; + const unsigned char *p; NETSCAPE_ENCRYPTED_PKEY *enckey = NULL; p = *pp; @@ -265,7 +265,6 @@ RSA *d2i_RSA_NET(RSA **a, const unsigned char **pp, long length, ASN1err(ASN1_F_D2I_RSA_NET,ASN1_R_UNSUPPORTED_ENCRYPTION_ALGORITHM); goto err; } - kp = enckey->enckey->digest->data; if (cb == NULL) cb=EVP_read_pw_string; if ((ret=d2i_RSA_NET_2(a, enckey->enckey->digest,cb, sgckey)) == NULL) goto err; |