diff options
| author | marha <marha@users.sourceforge.net> | 2010-06-17 08:30:55 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-06-17 08:30:55 +0000 |
| commit | eb8e32daea99b6e3ebf134efeeba184c23817f08 (patch) | |
| tree | ffbda57952ba3f40612e6409bd9a95f9a0a892dc /openssl/crypto/pem/pem.h | |
| parent | ed16af1abc515d7cc3ff9c5794aef89551fe7494 (diff) | |
| parent | fef0b61e18b9c7475e4d6e67ddfc55db46573f4e (diff) | |
| download | vcxsrv-eb8e32daea99b6e3ebf134efeeba184c23817f08.tar.gz vcxsrv-eb8e32daea99b6e3ebf134efeeba184c23817f08.tar.bz2 vcxsrv-eb8e32daea99b6e3ebf134efeeba184c23817f08.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'openssl/crypto/pem/pem.h')
| -rw-r--r-- | openssl/crypto/pem/pem.h | 3 |
1 files changed, 2 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 */ |