aboutsummaryrefslogtreecommitdiff
path: root/openssl/crypto/pem
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-06-16 16:17:11 +0000
committermarha <marha@users.sourceforge.net>2010-06-16 16:17:11 +0000
commitfef0b61e18b9c7475e4d6e67ddfc55db46573f4e (patch)
treed4c68ba5b80ca0748fb23f1c344e859efd79503f /openssl/crypto/pem
parent243edb24f5179d93c849ea326fb489d3f846db71 (diff)
downloadvcxsrv-fef0b61e18b9c7475e4d6e67ddfc55db46573f4e.tar.gz
vcxsrv-fef0b61e18b9c7475e4d6e67ddfc55db46573f4e.tar.bz2
vcxsrv-fef0b61e18b9c7475e4d6e67ddfc55db46573f4e.zip
Switched to openssl-1.0.0a
Diffstat (limited to 'openssl/crypto/pem')
-rw-r--r--openssl/crypto/pem/pem.h3
-rw-r--r--openssl/crypto/pem/pvkfmt.c5
2 files changed, 7 insertions, 1 deletions
diff --git a/openssl/crypto/pem/pem.h b/openssl/crypto/pem/pem.h
index 22231c26d..8a6ababe3 100644
--- a/openssl/crypto/pem/pem.h
+++ b/openssl/crypto/pem/pem.h
@@ -548,10 +548,11 @@ EVP_PKEY *b2i_PrivateKey_bio(BIO *in);
EVP_PKEY *b2i_PublicKey_bio(BIO *in);
int i2b_PrivateKey_bio(BIO *out, EVP_PKEY *pk);
int i2b_PublicKey_bio(BIO *out, EVP_PKEY *pk);
-
+#ifndef OPENSSL_NO_RC4
EVP_PKEY *b2i_PVK_bio(BIO *in, pem_password_cb *cb, void *u);
int i2b_PVK_bio(BIO *out, EVP_PKEY *pk, int enclevel,
pem_password_cb *cb, void *u);
+#endif
/* BEGIN ERROR CODES */
diff --git a/openssl/crypto/pem/pvkfmt.c b/openssl/crypto/pem/pvkfmt.c
index 11e1f10f5..d998a67fa 100644
--- a/openssl/crypto/pem/pvkfmt.c
+++ b/openssl/crypto/pem/pvkfmt.c
@@ -654,6 +654,8 @@ int i2b_PublicKey_bio(BIO *out, EVP_PKEY *pk)
return do_i2b_bio(out, pk, 1);
}
+#ifndef OPENSSL_NO_RC4
+
static int do_PVK_header(const unsigned char **in, unsigned int length,
int skip_magic,
unsigned int *psaltlen, unsigned int *pkeylen)
@@ -934,4 +936,7 @@ int i2b_PVK_bio(BIO *out, EVP_PKEY *pk, int enclevel,
}
return -1;
}
+
+#endif
+
#endif