diff options
| author | tedu <> | 2014-07-11 15:28:27 +0000 |
|---|---|---|
| committer | tedu <> | 2014-07-11 15:28:27 +0000 |
| commit | 29656fa80a131823d2354d1e12174d34ceb91019 (patch) | |
| tree | 90ee0df8e398d3036f8eca920f2d60a5830e20ce /src | |
| parent | 406373e1c997f9483fd931e40033662fbefb65fe (diff) | |
| download | openbsd-29656fa80a131823d2354d1e12174d34ceb91019.tar.gz openbsd-29656fa80a131823d2354d1e12174d34ceb91019.tar.bz2 openbsd-29656fa80a131823d2354d1e12174d34ceb91019.zip | |
OPENSSL_ALGORITHM_DEFINES has been removed from conf.h, no need for it now
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/evp/evp.h | 10 | ||||
| -rw-r--r-- | src/lib/libssl/src/crypto/evp/evp.h | 10 |
2 files changed, 4 insertions, 16 deletions
diff --git a/src/lib/libcrypto/evp/evp.h b/src/lib/libcrypto/evp/evp.h index 41b0259402..9de7c3f9ef 100644 --- a/src/lib/libcrypto/evp/evp.h +++ b/src/lib/libcrypto/evp/evp.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: evp.h,v 1.38 2014/06/24 19:31:50 miod Exp $ */ | 1 | /* $OpenBSD: evp.h,v 1.39 2014/07/11 15:28:27 tedu Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -59,13 +59,7 @@ | |||
| 59 | #ifndef HEADER_ENVELOPE_H | 59 | #ifndef HEADER_ENVELOPE_H |
| 60 | #define HEADER_ENVELOPE_H | 60 | #define HEADER_ENVELOPE_H |
| 61 | 61 | ||
| 62 | #ifdef OPENSSL_ALGORITHM_DEFINES | 62 | #include <openssl/opensslconf.h> |
| 63 | # include <openssl/opensslconf.h> | ||
| 64 | #else | ||
| 65 | # define OPENSSL_ALGORITHM_DEFINES | ||
| 66 | # include <openssl/opensslconf.h> | ||
| 67 | # undef OPENSSL_ALGORITHM_DEFINES | ||
| 68 | #endif | ||
| 69 | 63 | ||
| 70 | #include <openssl/ossl_typ.h> | 64 | #include <openssl/ossl_typ.h> |
| 71 | 65 | ||
diff --git a/src/lib/libssl/src/crypto/evp/evp.h b/src/lib/libssl/src/crypto/evp/evp.h index 41b0259402..9de7c3f9ef 100644 --- a/src/lib/libssl/src/crypto/evp/evp.h +++ b/src/lib/libssl/src/crypto/evp/evp.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: evp.h,v 1.38 2014/06/24 19:31:50 miod Exp $ */ | 1 | /* $OpenBSD: evp.h,v 1.39 2014/07/11 15:28:27 tedu Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -59,13 +59,7 @@ | |||
| 59 | #ifndef HEADER_ENVELOPE_H | 59 | #ifndef HEADER_ENVELOPE_H |
| 60 | #define HEADER_ENVELOPE_H | 60 | #define HEADER_ENVELOPE_H |
| 61 | 61 | ||
| 62 | #ifdef OPENSSL_ALGORITHM_DEFINES | 62 | #include <openssl/opensslconf.h> |
| 63 | # include <openssl/opensslconf.h> | ||
| 64 | #else | ||
| 65 | # define OPENSSL_ALGORITHM_DEFINES | ||
| 66 | # include <openssl/opensslconf.h> | ||
| 67 | # undef OPENSSL_ALGORITHM_DEFINES | ||
| 68 | #endif | ||
| 69 | 63 | ||
| 70 | #include <openssl/ossl_typ.h> | 64 | #include <openssl/ossl_typ.h> |
| 71 | 65 | ||