diff options
| author | beck <> | 2014-04-15 17:20:09 +0000 |
|---|---|---|
| committer | beck <> | 2014-04-15 17:20:09 +0000 |
| commit | 5e2db4ec770e5a5da3656f8278b74cca84f5e910 (patch) | |
| tree | 5d9ac18377bb61f576a5bd0c1c8ab6d919013625 /src | |
| parent | cb417b31eaa29b61e90364afb64ba1120c35e0f4 (diff) | |
| download | openbsd-5e2db4ec770e5a5da3656f8278b74cca84f5e910.tar.gz openbsd-5e2db4ec770e5a5da3656f8278b74cca84f5e910.tar.bz2 openbsd-5e2db4ec770e5a5da3656f8278b74cca84f5e910.zip | |
As we now remove it permanently, we no longer need NO_WINDOWS_BRAINDEATH
as a build time option...
ok deraadt@ miod@
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/crypto/Makefile | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/cversion.c | 4 | ||||
| -rw-r--r-- | src/lib/libssl/src/crypto/cversion.c | 4 |
3 files changed, 2 insertions, 10 deletions
diff --git a/src/lib/libcrypto/crypto/Makefile b/src/lib/libcrypto/crypto/Makefile index 26fe163249..f07176f829 100644 --- a/src/lib/libcrypto/crypto/Makefile +++ b/src/lib/libcrypto/crypto/Makefile | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: Makefile,v 1.6 2014/04/15 16:52:50 miod Exp $ | 1 | # $OpenBSD: Makefile,v 1.7 2014/04/15 17:20:09 beck Exp $ |
| 2 | 2 | ||
| 3 | LIB= crypto | 3 | LIB= crypto |
| 4 | 4 | ||
| @@ -24,7 +24,7 @@ CFLAGS+= -DDSO_DLFCN -DHAVE_DLFCN_H | |||
| 24 | PICFLAG=-fPIC | 24 | PICFLAG=-fPIC |
| 25 | .endif | 25 | .endif |
| 26 | 26 | ||
| 27 | CFLAGS+= -DTERMIOS -DANSI_SOURCE -DNO_ERR -DNO_WINDOWS_BRAINDEATH | 27 | CFLAGS+= -DTERMIOS -DANSI_SOURCE -DNO_ERR |
| 28 | # Hardware engines | 28 | # Hardware engines |
| 29 | CFLAGS+= -DOPENSSL_NO_HW_4758_CCA | 29 | CFLAGS+= -DOPENSSL_NO_HW_4758_CCA |
| 30 | CFLAGS+= -DOPENSSL_NO_HW_AEP | 30 | CFLAGS+= -DOPENSSL_NO_HW_AEP |
diff --git a/src/lib/libcrypto/cversion.c b/src/lib/libcrypto/cversion.c index 4bbe74bd5b..74317e2e14 100644 --- a/src/lib/libcrypto/cversion.c +++ b/src/lib/libcrypto/cversion.c | |||
| @@ -58,10 +58,6 @@ | |||
| 58 | 58 | ||
| 59 | #include "cryptlib.h" | 59 | #include "cryptlib.h" |
| 60 | 60 | ||
| 61 | #ifndef NO_WINDOWS_BRAINDEATH | ||
| 62 | #include "buildinf.h" | ||
| 63 | #endif | ||
| 64 | |||
| 65 | const char | 61 | const char |
| 66 | *SSLeay_version(int t) | 62 | *SSLeay_version(int t) |
| 67 | { | 63 | { |
diff --git a/src/lib/libssl/src/crypto/cversion.c b/src/lib/libssl/src/crypto/cversion.c index 4bbe74bd5b..74317e2e14 100644 --- a/src/lib/libssl/src/crypto/cversion.c +++ b/src/lib/libssl/src/crypto/cversion.c | |||
| @@ -58,10 +58,6 @@ | |||
| 58 | 58 | ||
| 59 | #include "cryptlib.h" | 59 | #include "cryptlib.h" |
| 60 | 60 | ||
| 61 | #ifndef NO_WINDOWS_BRAINDEATH | ||
| 62 | #include "buildinf.h" | ||
| 63 | #endif | ||
| 64 | |||
| 65 | const char | 61 | const char |
| 66 | *SSLeay_version(int t) | 62 | *SSLeay_version(int t) |
| 67 | { | 63 | { |