Deprecate Low Level Blowfish APIs Applications should instead use the higher level EVP APIs, e.g. EVP_Encrypt*() and EVP_Decrypt*(). Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Paul Dale <paul.dale@oracle.com> (Merged from https://github.com/openssl/openssl/pull/10740)
diff --git a/test/bftest.c b/test/bftest.c index 5b48925..f350ce7 100644 --- a/test/bftest.c +++ b/test/bftest.c
@@ -8,9 +8,10 @@ */ /* - * This has been a quickly hacked 'ideatest.c'. When I add tests for other - * RC2 modes, more of the code will be uncommented. + * BF low level APIs are deprecated for public use, but still ok for internal + * use. */ +#include "internal/deprecated.h" #include <stdio.h> #include <string.h>
diff --git a/test/build.info b/test/build.info index 11419ca..601059f 100644 --- a/test/build.info +++ b/test/build.info
@@ -38,7 +38,7 @@ rc2test rc4test rc5test \ destest mdc2test \ dhtest enginetest casttest \ - bftest ssltest_old dsatest dsa_no_digest_size_test exptest rsa_test \ + ssltest_old dsatest dsa_no_digest_size_test exptest rsa_test \ evp_pkey_provided_test evp_test evp_extra_test evp_fetch_prov_test \ v3nametest v3ext \ crltest danetest bad_dtls_test lhash_test sparse_array_test \ @@ -156,10 +156,6 @@ INCLUDE[casttest]=../include ../apps/include DEPEND[casttest]=../libcrypto libtestutil.a - SOURCE[bftest]=bftest.c - INCLUDE[bftest]=../include ../apps/include - DEPEND[bftest]=../libcrypto libtestutil.a - SOURCE[ssltest_old]=ssltest_old.c INCLUDE[ssltest_old]=.. ../include ../apps/include DEPEND[ssltest_old]=../libcrypto ../libssl @@ -216,10 +212,14 @@ IF[{- !$disabled{"deprecated"} || (defined $config{"api"} && $config{"api"} < 30000) -}] - PROGRAMS{noinst}=igetest + PROGRAMS{noinst}=igetest bftest SOURCE[igetest]=igetest.c INCLUDE[igetest]=../include ../apps/include DEPEND[igetest]=../libcrypto libtestutil.a + + SOURCE[bftest]=bftest.c + INCLUDE[bftest]=../include ../apps/include + DEPEND[bftest]=../libcrypto libtestutil.a ENDIF SOURCE[v3nametest]=v3nametest.c
diff --git a/test/recipes/05-test_bf.t b/test/recipes/05-test_bf.t index 35bfef6..1c7c005 100644 --- a/test/recipes/05-test_bf.t +++ b/test/recipes/05-test_bf.t
@@ -6,7 +6,17 @@ # in the file LICENSE in the source distribution or at # https://www.openssl.org/source/license.html +use strict; +use warnings; use OpenSSL::Test::Simple; +use OpenSSL::Test; +use OpenSSL::Test::Utils; + +setup("test_bf"); + +plan skip_all => "Low-level Blowfish APIs are disabled in this build" + if disabled("deprecated") + && (!defined config("api") || config("api") >= 30000); simple_test("test_bf", "bftest", "bf");