diff options
| author | sthen <> | 2014-04-14 21:54:29 +0000 |
|---|---|---|
| committer | sthen <> | 2014-04-14 21:54:29 +0000 |
| commit | 8716039eddb50304567f2a79faacbc911fffe88e (patch) | |
| tree | f82a53d824b2040c6c405e7b189c6b51265666cd /src | |
| parent | 715a2c58fe812af3f07885ee27a3fc208e84c5ce (diff) | |
| download | openbsd-8716039eddb50304567f2a79faacbc911fffe88e.tar.gz openbsd-8716039eddb50304567f2a79faacbc911fffe88e.tar.bz2 openbsd-8716039eddb50304567f2a79faacbc911fffe88e.zip | |
revert 1.2 and define OPENSSL_NO_EC_NISTP_64_GCC_128 again, it has a downside
(breaks ssh ecdsa keys)
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/arch/amd64/opensslconf.h | 3 | ||||
| -rw-r--r-- | src/lib/libcrypto/crypto/arch/amd64/opensslconf.h | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/lib/libcrypto/arch/amd64/opensslconf.h b/src/lib/libcrypto/arch/amd64/opensslconf.h index 4d68fa2cc6..f969fd75e4 100644 --- a/src/lib/libcrypto/arch/amd64/opensslconf.h +++ b/src/lib/libcrypto/arch/amd64/opensslconf.h | |||
| @@ -8,6 +8,9 @@ | |||
| 8 | #ifndef OPENSSL_NO_CAMELLIA | 8 | #ifndef OPENSSL_NO_CAMELLIA |
| 9 | # define OPENSSL_NO_CAMELLIA | 9 | # define OPENSSL_NO_CAMELLIA |
| 10 | #endif | 10 | #endif |
| 11 | #ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 | ||
| 12 | # define OPENSSL_NO_EC_NISTP_64_GCC_128 | ||
| 13 | #endif | ||
| 11 | #ifndef OPENSSL_NO_CMS | 14 | #ifndef OPENSSL_NO_CMS |
| 12 | # define OPENSSL_NO_CMS | 15 | # define OPENSSL_NO_CMS |
| 13 | #endif | 16 | #endif |
diff --git a/src/lib/libcrypto/crypto/arch/amd64/opensslconf.h b/src/lib/libcrypto/crypto/arch/amd64/opensslconf.h index 4d68fa2cc6..f969fd75e4 100644 --- a/src/lib/libcrypto/crypto/arch/amd64/opensslconf.h +++ b/src/lib/libcrypto/crypto/arch/amd64/opensslconf.h | |||
| @@ -8,6 +8,9 @@ | |||
| 8 | #ifndef OPENSSL_NO_CAMELLIA | 8 | #ifndef OPENSSL_NO_CAMELLIA |
| 9 | # define OPENSSL_NO_CAMELLIA | 9 | # define OPENSSL_NO_CAMELLIA |
| 10 | #endif | 10 | #endif |
| 11 | #ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 | ||
| 12 | # define OPENSSL_NO_EC_NISTP_64_GCC_128 | ||
| 13 | #endif | ||
| 11 | #ifndef OPENSSL_NO_CMS | 14 | #ifndef OPENSSL_NO_CMS |
| 12 | # define OPENSSL_NO_CMS | 15 | # define OPENSSL_NO_CMS |
| 13 | #endif | 16 | #endif |