From df11e1e921f420f4fa911df15c887d9ad2740867 Mon Sep 17 00:00:00 2001 From: Geoff Thorpe Date: Thu, 17 Jun 2004 23:50:25 +0000 Subject: [PATCH] Deprecate unused cruft, and "make update". --- CHANGES | 3 +++ TABLE | 2 +- crypto/bn/bn.h | 2 ++ crypto/bn/bn_lib.c | 3 +++ util/libeay.num | 8 ++++++-- 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 4a28fc9205..41a087f28d 100644 --- a/CHANGES +++ b/CHANGES @@ -4,6 +4,9 @@ Changes between 0.9.7e and 0.9.8 [xx XXX xxxx] + *) Deprecate BN_[get|set]_params() functions (they were ignored internally). + [Geoff Thorpe] + *) New FIPS 180-2 algorithms, SHA-224/-256/-384/-512 are implemented. [Andy Polyakov and a number of other people] diff --git a/TABLE b/TABLE index 3e2319bc34..a3f2fd89e5 100644 --- a/TABLE +++ b/TABLE @@ -1652,7 +1652,7 @@ $arflags = *** debug-geoff $cc = gcc -$cflags = -DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DBN_CTX_DEBUG -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -g -ggdb3 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long +$cflags = -DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long $unistd = $thread_cflag = -D_REENTRANT $sys_id = diff --git a/crypto/bn/bn.h b/crypto/bn/bn.h index 0f6373aea9..3477a13fff 100644 --- a/crypto/bn/bn.h +++ b/crypto/bn/bn.h @@ -539,8 +539,10 @@ int BN_BLINDING_update(BN_BLINDING *b,BN_CTX *ctx); int BN_BLINDING_convert(BIGNUM *n, BN_BLINDING *r, BN_CTX *ctx); int BN_BLINDING_invert(BIGNUM *n, BN_BLINDING *b, BN_CTX *ctx); +#ifndef OPENSSL_NO_DEPRECATED void BN_set_params(int mul,int high,int low,int mont); int BN_get_params(int which); /* 0, mul, 1 high, 2 low, 3 mont */ +#endif void BN_RECP_CTX_init(BN_RECP_CTX *recp); BN_RECP_CTX *BN_RECP_CTX_new(void); diff --git a/crypto/bn/bn_lib.c b/crypto/bn/bn_lib.c index bbc359cb78..789e9aa4fb 100644 --- a/crypto/bn/bn_lib.c +++ b/crypto/bn/bn_lib.c @@ -69,6 +69,8 @@ const char *BN_version="Big Number" OPENSSL_VERSION_PTEXT; +/* This stuff appears to be completely unused, so is deprecated */ +#ifndef OPENSSL_NO_DEPRECATED /* For a 32 bit machine * 2 - 4 == 128 * 3 - 8 == 256 @@ -127,6 +129,7 @@ int BN_get_params(int which) else if (which == 3) return(bn_limit_bits_mont); else return(0); } +#endif const BIGNUM *BN_value_one(void) { diff --git a/util/libeay.num b/util/libeay.num index b6dab24003..3f70cd9586 100755 --- a/util/libeay.num +++ b/util/libeay.num @@ -1221,8 +1221,8 @@ BIO_f_reliable 1244 EXIST::FUNCTION:BIO PKCS7_dataFinal 1245 EXIST::FUNCTION: PKCS7_dataDecode 1246 EXIST::FUNCTION: X509V3_EXT_CRL_add_conf 1247 EXIST::FUNCTION: -BN_set_params 1248 EXIST::FUNCTION: -BN_get_params 1249 EXIST::FUNCTION: +BN_set_params 1248 EXIST::FUNCTION:DEPRECATED +BN_get_params 1249 EXIST::FUNCTION:DEPRECATED BIO_get_ex_num 1250 NOEXIST::FUNCTION: BIO_set_ex_free_func 1251 NOEXIST::FUNCTION: EVP_ripemd160 1252 EXIST::FUNCTION:RIPEMD @@ -3227,3 +3227,7 @@ SHA384_Init 3629 EXIST::FUNCTION:SHA,SHA512 SHA384_Final 3630 EXIST::FUNCTION:SHA,SHA512 SHA384 3631 EXIST::FUNCTION:SHA,SHA512 SHA256_Update 3632 EXIST::FUNCTION:SHA,SHA256 +EVP_sha384 3633 EXIST::FUNCTION:SHA,SHA512 +EVP_sha512 3634 EXIST::FUNCTION:SHA,SHA512 +EVP_sha224 3635 EXIST::FUNCTION:SHA,SHA256 +EVP_sha256 3636 EXIST::FUNCTION:SHA,SHA256 -- GitLab