summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/rsa
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/rsa
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/rsa')
-rw-r--r--src/lib/libcrypto/rsa/rsa_crpt.c3
-rw-r--r--src/lib/libcrypto/rsa/rsa_lib.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/libcrypto/rsa/rsa_crpt.c b/src/lib/libcrypto/rsa/rsa_crpt.c
index cf7f9a328b..809dd14c92 100644
--- a/src/lib/libcrypto/rsa/rsa_crpt.c
+++ b/src/lib/libcrypto/rsa/rsa_crpt.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: rsa_crpt.c,v 1.13 2015/02/09 15:49:22 jsing Exp $ */ 1/* $OpenBSD: rsa_crpt.c,v 1.14 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 *
@@ -62,6 +62,7 @@
62 62
63#include <openssl/bn.h> 63#include <openssl/bn.h>
64#include <openssl/crypto.h> 64#include <openssl/crypto.h>
65#include <openssl/err.h>
65#include <openssl/lhash.h> 66#include <openssl/lhash.h>
66#include <openssl/rsa.h> 67#include <openssl/rsa.h>
67 68
diff --git a/src/lib/libcrypto/rsa/rsa_lib.c b/src/lib/libcrypto/rsa/rsa_lib.c
index 967fc36f25..51dc94a134 100644
--- a/src/lib/libcrypto/rsa/rsa_lib.c
+++ b/src/lib/libcrypto/rsa/rsa_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: rsa_lib.c,v 1.29 2014/10/18 17:20:40 jsing Exp $ */ 1/* $OpenBSD: rsa_lib.c,v 1.30 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 *
@@ -62,6 +62,7 @@
62 62
63#include <openssl/bn.h> 63#include <openssl/bn.h>
64#include <openssl/crypto.h> 64#include <openssl/crypto.h>
65#include <openssl/err.h>
65#include <openssl/lhash.h> 66#include <openssl/lhash.h>
66#include <openssl/rsa.h> 67#include <openssl/rsa.h>
67 68