summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/evp
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/evp
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/evp')
-rw-r--r--src/lib/libcrypto/evp/digest.c3
-rw-r--r--src/lib/libcrypto/evp/pmeth_lib.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/libcrypto/evp/digest.c b/src/lib/libcrypto/evp/digest.c
index c9fb60d49b..6d8ed9b499 100644
--- a/src/lib/libcrypto/evp/digest.c
+++ b/src/lib/libcrypto/evp/digest.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: digest.c,v 1.25 2015/02/10 09:52:35 miod Exp $ */ 1/* $OpenBSD: digest.c,v 1.26 2015/02/11 03:19:37 doug 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 *
@@ -114,6 +114,7 @@
114 114
115#include <openssl/opensslconf.h> 115#include <openssl/opensslconf.h>
116 116
117#include <openssl/err.h>
117#include <openssl/evp.h> 118#include <openssl/evp.h>
118#include <openssl/objects.h> 119#include <openssl/objects.h>
119 120
diff --git a/src/lib/libcrypto/evp/pmeth_lib.c b/src/lib/libcrypto/evp/pmeth_lib.c
index 24cdfdd1d0..c93fa99cc6 100644
--- a/src/lib/libcrypto/evp/pmeth_lib.c
+++ b/src/lib/libcrypto/evp/pmeth_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pmeth_lib.c,v 1.10 2014/11/09 19:17:13 miod Exp $ */ 1/* $OpenBSD: pmeth_lib.c,v 1.11 2015/02/11 03:19:37 doug Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2006. 3 * project 2006.
4 */ 4 */
@@ -62,6 +62,7 @@
62 62
63#include <openssl/opensslconf.h> 63#include <openssl/opensslconf.h>
64 64
65#include <openssl/err.h>
65#include <openssl/evp.h> 66#include <openssl/evp.h>
66#include <openssl/objects.h> 67#include <openssl/objects.h>
67 68