summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/ts/ts_conf.c
diff options
context:
space:
mode:
authordoug <>2015-02-11 03:19:37 +0000
committerdoug <>2015-02-11 03:19:37 +0000
commitdea579e3ced20a997dc9c2b82eb0c086555a68b8 (patch)
tree2d213cc4df03f8f141841d2ca287094d778f0ca1 /src/lib/libcrypto/ts/ts_conf.c
parentc26652e36ac1ecfa50a2d217fdd0c2786495c552 (diff)
downloadopenbsd-dea579e3ced20a997dc9c2b82eb0c086555a68b8.tar.gz
openbsd-dea579e3ced20a997dc9c2b82eb0c086555a68b8.tar.bz2
openbsd-dea579e3ced20a997dc9c2b82eb0c086555a68b8.zip
Enable building with -DOPENSSL_NO_DEPRECATED.
If you didn't enable deprecated code, there were missing err.h and bn.h includes. This commit allows building with or without deprecated code. This was not derived from an OpenSSL commit. However, they recently enabled OPENSSL_NO_DEPRECATED in git and fixed these header problems in a different way. Verified with clang that this only changes line numbers in the generated asm. ok miod@
Diffstat (limited to 'src/lib/libcrypto/ts/ts_conf.c')
-rw-r--r--src/lib/libcrypto/ts/ts_conf.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/libcrypto/ts/ts_conf.c b/src/lib/libcrypto/ts/ts_conf.c
index 5266f91e63..bb98a6ff4c 100644
--- a/src/lib/libcrypto/ts/ts_conf.c
+++ b/src/lib/libcrypto/ts/ts_conf.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ts_conf.c,v 1.8 2014/10/28 05:46:56 miod Exp $ */ 1/* $OpenBSD: ts_conf.c,v 1.9 2015/02/11 03:19:37 doug Exp $ */
2/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL 2/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
3 * project 2002. 3 * project 2002.
4 */ 4 */
@@ -61,6 +61,7 @@
61#include <openssl/opensslconf.h> 61#include <openssl/opensslconf.h>
62 62
63#include <openssl/crypto.h> 63#include <openssl/crypto.h>
64#include <openssl/err.h>
64#include <openssl/pem.h> 65#include <openssl/pem.h>
65#include <openssl/ts.h> 66#include <openssl/ts.h>
66 67