aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2014-12-17 13:21:54 +0000
committerMatt Caswell <matt@openssl.org>2014-12-18 19:57:05 +0000
commit5bafb04d2e8a792afbc97395410ef3291f3fbc8b (patch)
treea388c006076851d146eece229f3396319971582c
parent07c4c14c4739da0c44562328afb6e7273e51298c (diff)
downloadopenssl-5bafb04d2e8a792afbc97395410ef3291f3fbc8b.tar.gz
Remove redundant OPENSSL_NO_DEPRECATED suppression
Reviewed-by: Rich Salz <rsalz@openssl.org>
-rw-r--r--apps/dsaparam.c5
-rw-r--r--apps/gendh.c5
-rw-r--r--apps/genrsa.c5
-rw-r--r--apps/req.c6
-rw-r--r--apps/s_server.c5
-rw-r--r--crypto/bn/bntest.c6
-rw-r--r--crypto/dh/dhtest.c6
-rw-r--r--crypto/dsa/dsatest.c6
8 files changed, 0 insertions, 44 deletions
diff --git a/apps/dsaparam.c b/apps/dsaparam.c
index 8ee5d42ae7..fcbd794947 100644
--- a/apps/dsaparam.c
+++ b/apps/dsaparam.c
@@ -57,11 +57,6 @@
*/
#include <openssl/opensslconf.h> /* for OPENSSL_NO_DSA */
-/* Until the key-gen callbacks are modified to use newer prototypes, we allow
- * deprecated functions for openssl-internal code */
-#ifdef OPENSSL_NO_DEPRECATED
-#undef OPENSSL_NO_DEPRECATED
-#endif
#ifndef OPENSSL_NO_DSA
#include <assert.h>
diff --git a/apps/gendh.c b/apps/gendh.c
index c8645a4993..4581bfac70 100644
--- a/apps/gendh.c
+++ b/apps/gendh.c
@@ -58,11 +58,6 @@
*/
#include <openssl/opensslconf.h>
-/* Until the key-gen callbacks are modified to use newer prototypes, we allow
- * deprecated functions for openssl-internal code */
-#ifdef OPENSSL_NO_DEPRECATED
-#undef OPENSSL_NO_DEPRECATED
-#endif
#ifndef OPENSSL_NO_DH
#include <stdio.h>
diff --git a/apps/genrsa.c b/apps/genrsa.c
index 54e30d343b..fe00af9bd2 100644
--- a/apps/genrsa.c
+++ b/apps/genrsa.c
@@ -57,11 +57,6 @@
*/
#include <openssl/opensslconf.h>
-/* Until the key-gen callbacks are modified to use newer prototypes, we allow
- * deprecated functions for openssl-internal code */
-#ifdef OPENSSL_NO_DEPRECATED
-#undef OPENSSL_NO_DEPRECATED
-#endif
#ifndef OPENSSL_NO_RSA
#include <stdio.h>
diff --git a/apps/req.c b/apps/req.c
index 87ab41293d..a69915f2f4 100644
--- a/apps/req.c
+++ b/apps/req.c
@@ -56,12 +56,6 @@
* [including the GNU Public Licence.]
*/
-/* Until the key-gen callbacks are modified to use newer prototypes, we allow
- * deprecated functions for openssl-internal code */
-#ifdef OPENSSL_NO_DEPRECATED
-#undef OPENSSL_NO_DEPRECATED
-#endif
-
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
diff --git a/apps/s_server.c b/apps/s_server.c
index 21f7e04d58..1e407696e7 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -140,11 +140,6 @@
* OTHERWISE.
*/
-/* Until the key-gen callbacks are modified to use newer prototypes, we allow
- * deprecated functions for openssl-internal code */
-#ifdef OPENSSL_NO_DEPRECATED
-#undef OPENSSL_NO_DEPRECATED
-#endif
#include <assert.h>
#include <ctype.h>
diff --git a/crypto/bn/bntest.c b/crypto/bn/bntest.c
index 6e18a69363..0fa2504ceb 100644
--- a/crypto/bn/bntest.c
+++ b/crypto/bn/bntest.c
@@ -69,12 +69,6 @@
*
*/
-/* Until the key-gen callbacks are modified to use newer prototypes, we allow
- * deprecated functions for openssl-internal code */
-#ifdef OPENSSL_NO_DEPRECATED
-#undef OPENSSL_NO_DEPRECATED
-#endif
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/crypto/dh/dhtest.c b/crypto/dh/dhtest.c
index c98c8047a6..f4c2fd9cea 100644
--- a/crypto/dh/dhtest.c
+++ b/crypto/dh/dhtest.c
@@ -56,12 +56,6 @@
* [including the GNU Public Licence.]
*/
-/* Until the key-gen callbacks are modified to use newer prototypes, we allow
- * deprecated functions for openssl-internal code */
-#ifdef OPENSSL_NO_DEPRECATED
-#undef OPENSSL_NO_DEPRECATED
-#endif
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/crypto/dsa/dsatest.c b/crypto/dsa/dsatest.c
index 271a8e0d0f..152205f1c0 100644
--- a/crypto/dsa/dsatest.c
+++ b/crypto/dsa/dsatest.c
@@ -56,12 +56,6 @@
* [including the GNU Public Licence.]
*/
-/* Until the key-gen callbacks are modified to use newer prototypes, we allow
- * deprecated functions for openssl-internal code */
-#ifdef OPENSSL_NO_DEPRECATED
-#undef OPENSSL_NO_DEPRECATED
-#endif
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>