diff options
| author | Matt Caswell <matt@openssl.org> | 2016-04-22 12:10:19 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-04-22 14:42:15 +0100 |
| commit | 54c010ab8079828630cb0258f8ea6ab5cb9bfce8 (patch) | |
| tree | c938a8b0a7d076c939c0d0f0c2a954bb613887ab /include | |
| parent | 04e381ff176060b7dbfe31a357101e42a2b32a96 (diff) | |
| download | openssl-54c010ab8079828630cb0258f8ea6ab5cb9bfce8.tar.gz | |
Fix no-dsa on Windows/VMS
The no-dsa option was failing on Windows because some symbols were not
correctly flagged in libcrypto.num. Problem found due to the new symbol
consistency test.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/pem.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/openssl/pem.h b/include/openssl/pem.h index 96655dc127..1ec33d37eb 100644 --- a/include/openssl/pem.h +++ b/include/openssl/pem.h @@ -442,16 +442,18 @@ int PEM_write_PKCS8PrivateKey(FILE *fp, EVP_PKEY *x, const EVP_CIPHER *enc, EVP_PKEY *PEM_read_bio_Parameters(BIO *bp, EVP_PKEY **x); int PEM_write_bio_Parameters(BIO *bp, EVP_PKEY *x); +# ifndef OPENSSL_NO_DSA EVP_PKEY *b2i_PrivateKey(const unsigned char **in, long length); EVP_PKEY *b2i_PublicKey(const unsigned char **in, long length); 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 +# 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 # endif /* BEGIN ERROR CODES */ |