diff options
| author | David Benjamin <davidben@chromium.org> | 2014-08-27 22:35:09 +0400 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2014-08-28 04:41:34 +0400 |
| commit | 457112e1973251a721ae419128d7108844d3c1a3 (patch) | |
| tree | ccd7d5d5d2bd10345a78f7a789a674388ac96a97 /crypto/pem | |
| parent | 1f3591d4c75fc4039dbd120ff1c459b311e976e2 (diff) | |
unifdef a bunch of OPENSSL_NO_* ifdefs.
Get all this stuff out of the way.
- OPENSSL_NO_MD5
- OPENSSL_NO_SHA
- OPENSSL_NO_EC
- OPENSSL_NO_ECDSA
- OPENSSL_NO_ECDH
- OPENSSL_NO_NEXTPROTONEG
- OPENSSL_NO_DH
- OPENSSL_NO_SSL3
- OPENSSL_NO_RC4
- OPENSSL_NO_RSA
Also manually removed a couple instances of OPENSSL_NO_DSA that seemed to be
confused anyway. Did some minor manual cleanup. (Removed a few now-pointless
'if (0)'s.)
Change-Id: Id540ba97ee22ff2309ab20ceb24c7eabe766d4c4
Reviewed-on: https://boringssl-review.googlesource.com/1662
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'crypto/pem')
| -rw-r--r-- | crypto/pem/pem_all.c | 4 | ||||
| -rw-r--r-- | crypto/pem/pem_info.c | 2 | ||||
| -rw-r--r-- | crypto/pem/pem_pkey.c | 2 |
3 files changed, 0 insertions, 8 deletions
diff --git a/crypto/pem/pem_all.c b/crypto/pem/pem_all.c index c1b8d6ed..24ecc62a 100644 --- a/crypto/pem/pem_all.c +++ b/crypto/pem/pem_all.c @@ -224,7 +224,6 @@ IMPLEMENT_PEM_rw_const(DSAparams, DSA, PEM_STRING_DSAPARAMS, DSAparams) #endif -#ifndef OPENSSL_NO_EC static EC_KEY *pkey_get_eckey(EVP_PKEY *key, EC_KEY **eckey) { EC_KEY *dtmp; @@ -271,15 +270,12 @@ EC_KEY *PEM_read_ECPrivateKey(FILE *fp, EC_KEY **eckey, pem_password_cb *cb, #endif -#endif -#ifndef OPENSSL_NO_DH IMPLEMENT_PEM_write_const(DHparams, DH, PEM_STRING_DHPARAMS, DHparams) /* TODO(fork): remove this code? */ /* IMPLEMENT_PEM_write_const(DHxparams, DH, PEM_STRING_DHXPARAMS, DHxparams) */ -#endif IMPLEMENT_PEM_rw(PUBKEY, EVP_PKEY, PEM_STRING_PUBLIC, PUBKEY) diff --git a/crypto/pem/pem_info.c b/crypto/pem/pem_info.c index 6e59a7fc..c4974c20 100644 --- a/crypto/pem/pem_info.c +++ b/crypto/pem/pem_info.c @@ -207,7 +207,6 @@ start: } else #endif -#ifndef OPENSSL_NO_EC if (strcmp(name,PEM_STRING_ECPRIVATEKEY) == 0) { d2i=(D2I_OF(void))d2i_ECPrivateKey; @@ -228,7 +227,6 @@ start: raw=1; } else -#endif { d2i=NULL; pp=NULL; diff --git a/crypto/pem/pem_pkey.c b/crypto/pem/pem_pkey.c index d0f08c8e..0ef08d0e 100644 --- a/crypto/pem/pem_pkey.c +++ b/crypto/pem/pem_pkey.c @@ -262,7 +262,6 @@ int PEM_write_PrivateKey(FILE *fp, EVP_PKEY *x, const EVP_CIPHER *enc, #endif -#ifndef OPENSSL_NO_DH /* Transparently read in PKCS#3 or X9.42 DH parameters */ @@ -310,4 +309,3 @@ DH *PEM_read_DHparams(FILE *fp, DH **x, pem_password_cb *cb, void *u) } #endif -#endif |