generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PR: 2220

Browse Source 
Fixes to make OpenSSL compile with no-rc4
This commit is contained in:
Dr. Stephen Henson
2010-04-06 11:18:32 +00:00
parent 6747de655e
commit 5b0a79a27a
6 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
crypto/pem/pem.h
View File

@@ -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 */

5
crypto/pem/pvkfmt.c
View File

@@ -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