diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2010-04-06 11:18:59 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2010-04-06 11:18:59 +0000 |
| commit | 00a37b5a9b295c1b55ca9a1c1f207d347ad5b24a (patch) | |
| tree | 91ce8cff93b6ced7f9348bc4cc14e7e787fec635 /crypto/pem | |
| parent | bc494872b8ba6862e59035a643430d764a3a4b2a (diff) | |
PR: 2220
Fixes to make OpenSSL compile with no-rc4
Diffstat (limited to 'crypto/pem')
| -rw-r--r-- | crypto/pem/pem.h | 3 | ||||
| -rw-r--r-- | crypto/pem/pvkfmt.c | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/crypto/pem/pem.h b/crypto/pem/pem.h index c2d7690580..fb704975b7 100644 --- a/crypto/pem/pem.h +++ b/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/crypto/pem/pvkfmt.c b/crypto/pem/pvkfmt.c index 0d6c749c33..0dd6f5d98a 100644 --- a/crypto/pem/pvkfmt.c +++ b/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) @@ -946,4 +948,7 @@ int i2b_PVK_bio(BIO *out, EVP_PKEY *pk, int enclevel, } return -1; } + +#endif + #endif |