diff options
| author |   tedu <tedu@openbsd.org> | 2014-07-11 15:28:27 +0000 |
|---|---|---|
| committer | tedu <tedu@openbsd.org> | 2014-07-11 15:28:27 +0000 |
| commit | 6067f4e2442ae52512d099b8b6f86cba2095eebb (patch) | |
| tree | e7939c9541dc204993e6010938374a4bdf8e0aca | |
| parent | use optval for setsockopt; sync with ping6 (diff) | |
| download | wireguard-openbsd-6067f4e2442ae52512d099b8b6f86cba2095eebb.tar.xz wireguard-openbsd-6067f4e2442ae52512d099b8b6f86cba2095eebb.zip | |
OPENSSL_ALGORITHM_DEFINES has been removed from conf.h, no need for it now
| -rw-r--r-- | lib/libcrypto/evp/evp.h | 10 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/evp/evp.h | 10 |
2 files changed, 4 insertions, 16 deletions
diff --git a/lib/libcrypto/evp/evp.h b/lib/libcrypto/evp/evp.h index 41b02594029..9de7c3f9ef1 100644 --- a/lib/libcrypto/evp/evp.h +++ b/lib/libcrypto/evp/evp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: evp.h,v 1.38 2014/06/24 19:31:50 miod Exp $ */ +/* $OpenBSD: evp.h,v 1.39 2014/07/11 15:28:27 tedu Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -59,13 +59,7 @@ #ifndef HEADER_ENVELOPE_H #define HEADER_ENVELOPE_H -#ifdef OPENSSL_ALGORITHM_DEFINES -# include <openssl/opensslconf.h> -#else -# define OPENSSL_ALGORITHM_DEFINES -# include <openssl/opensslconf.h> -# undef OPENSSL_ALGORITHM_DEFINES -#endif +#include <openssl/opensslconf.h> #include <openssl/ossl_typ.h> diff --git a/lib/libssl/src/crypto/evp/evp.h b/lib/libssl/src/crypto/evp/evp.h index 41b02594029..9de7c3f9ef1 100644 --- a/lib/libssl/src/crypto/evp/evp.h +++ b/lib/libssl/src/crypto/evp/evp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: evp.h,v 1.38 2014/06/24 19:31:50 miod Exp $ */ +/* $OpenBSD: evp.h,v 1.39 2014/07/11 15:28:27 tedu Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -59,13 +59,7 @@ #ifndef HEADER_ENVELOPE_H #define HEADER_ENVELOPE_H -#ifdef OPENSSL_ALGORITHM_DEFINES -# include <openssl/opensslconf.h> -#else -# define OPENSSL_ALGORITHM_DEFINES -# include <openssl/opensslconf.h> -# undef OPENSSL_ALGORITHM_DEFINES -#endif +#include <openssl/opensslconf.h> #include <openssl/ossl_typ.h> |