Remove redundant OPENSSL_NO_DEPRECATED suppression

Reviewed-by: Rich Salz <rsalz@openssl.org>

diff --git a/apps/dsaparam.c b/apps/dsaparam.c
index 8ee5d42ae756b88e0657af46b5364a151a3a3639..fcbd79494747b245956434fcc6a38b160c447d49 100644 (file)
--- 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 c8645a4993a69b9078813e8bdde06411617c3b30..4581bfac7096f7786b1e212854817d993b68377d 100644 (file)
--- 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 54e30d343bdb5272dfa1c4bbc3dc786ebce979a2..fe00af9bd2d20bc07e57716b55f89869e665345e 100644 (file)
--- 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 87ab41293d1d39add005890cdf234828a5f0801b..a69915f2f4b4a3041ac969e5700303ed8747a096 100644 (file)
--- 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 21f7e04d58c8060fda8e47a9c84b4cc9706767ae..1e407696e7f4edc3e48d4da56c362be72e4cdbd7 100644 (file)
--- 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 6e18a6936317bc87049e4b27c6291b1f19b45c97..0fa2504cebc165d58fbb24e11f54e65d535134b2 100644 (file)
--- 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 c98c8047a62b3ddbeccfdc66da21df9692d09ccf..f4c2fd9ceaad36f32771088da05870ecf656495b 100644 (file)
--- 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 271a8e0d0f8c63f815f5ab33f836e9e8ad7014b1..152205f1c01b0069ca8d603eb2904d59abc21182 100644 (file)
--- 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>