diff options
| author | Brian Carlstrom <bdc@google.com> | 2010-08-18 11:26:06 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2010-08-18 11:26:06 -0700 |
| commit | 3d3a1b8fcf46ca3bdb3d8f09acd6ef604624a30d (patch) | |
| tree | 8f1d76d465ea3ed01709d0771f503c7cb4ab0ae6 /include/openssl/pem.h | |
| parent | ff9be29b89c031de40089cc045b19e427e87aa00 (diff) | |
| download | replicant_openssl-3d3a1b8fcf46ca3bdb3d8f09acd6ef604624a30d.zip replicant_openssl-3d3a1b8fcf46ca3bdb3d8f09acd6ef604624a30d.tar.gz replicant_openssl-3d3a1b8fcf46ca3bdb3d8f09acd6ef604624a30d.tar.bz2 | |
Upgrade to openssl-1.0.0a
- Updated README.android
- Updated openssl.version
- Ran ./import_openssl.sh import .../openssl-1.0.0a.tar.gz
(which is responsible for the rest of the changes)
Change-Id: I3214fb8cb5297d68edc7632bbd9027952fec559b
Diffstat (limited to 'include/openssl/pem.h')
| -rw-r--r-- | include/openssl/pem.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/openssl/pem.h b/include/openssl/pem.h index 22231c2..8a6abab 100644 --- a/include/openssl/pem.h +++ b/include/openssl/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 */ |