From fbfcb2243941bc84b7585711feb906610f9111c4 Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Fri, 7 Aug 2015 17:09:30 -0400 Subject: [PATCH] RT3999: Remove sub-component version strings Especially since after the #ifdef cleanups this is not useful. Reviewed-by: Matt Caswell --- crypto/aes/aes_misc.c | 2 -- crypto/asn1/asn1_lib.c | 1 - crypto/bf/bf_ecb.c | 2 -- crypto/bn/bn_lib.c | 2 -- crypto/camellia/cmll_misc.c | 2 -- crypto/cast/c_ecb.c | 2 -- crypto/conf/conf_def.c | 2 -- crypto/conf/conf_lib.c | 2 -- crypto/des/ecb_enc.c | 2 -- crypto/dh/dh_lib.c | 2 -- crypto/dsa/dsa_lib.c | 2 -- crypto/ec/ec_lib.c | 2 -- crypto/ecdh/ech_lib.c | 2 -- crypto/ecdsa/ecs_lib.c | 2 -- crypto/evp/evp_enc.c | 2 -- crypto/idea/i_ecb.c | 2 -- crypto/lhash/lhash.c | 2 -- crypto/md2/md2_dgst.c | 2 -- crypto/md4/md4_dgst.c | 2 -- crypto/md5/md5_dgst.c | 2 -- crypto/pem/pem_lib.c | 2 -- crypto/rand/md_rand.c | 2 -- crypto/rc2/rc2_ecb.c | 2 -- crypto/rc4/rc4_skey.c | 2 -- crypto/rc5/rc5_ecb.c | 2 -- crypto/ripemd/rmd_dgst.c | 2 -- crypto/rsa/rsa_lib.c | 2 -- crypto/sha/sha1dgst.c | 2 -- crypto/sha/sha256.c | 2 -- crypto/sha/sha512.c | 2 -- crypto/stack/stack.c | 2 -- crypto/txt_db/txt_db.c | 2 -- crypto/x509/x509_vfy.c | 1 - include/openssl/opensslv.h | 1 - ssl/d1_lib.c | 1 - ssl/s3_lib.c | 2 -- ssl/t1_lib.c | 2 -- 37 files changed, 70 deletions(-) diff --git a/crypto/aes/aes_misc.c b/crypto/aes/aes_misc.c index 68a48bac1b..1775442759 100644 --- a/crypto/aes/aes_misc.c +++ b/crypto/aes/aes_misc.c @@ -53,8 +53,6 @@ #include #include "aes_locl.h" -const char AES_version[] = "AES" OPENSSL_VERSION_PTEXT; - const char *AES_options(void) { #ifdef FULL_UNROLL diff --git a/crypto/asn1/asn1_lib.c b/crypto/asn1/asn1_lib.c index b611f35f22..94b5ad5d91 100644 --- a/crypto/asn1/asn1_lib.c +++ b/crypto/asn1/asn1_lib.c @@ -64,7 +64,6 @@ static int asn1_get_length(const unsigned char **pp, int *inf, long *rl, int max); static void asn1_put_length(unsigned char **pp, int length); -const char ASN1_version[] = "ASN.1" OPENSSL_VERSION_PTEXT; static int _asn1_check_infinite_end(const unsigned char **p, long len) { diff --git a/crypto/bf/bf_ecb.c b/crypto/bf/bf_ecb.c index 967a7f5507..7a45a02537 100644 --- a/crypto/bf/bf_ecb.c +++ b/crypto/bf/bf_ecb.c @@ -66,8 +66,6 @@ * SECURITY WORKSHOP, CAMBRIDGE, U.K., DECEMBER 9-11, 1993) */ -const char BF_version[] = "Blowfish" OPENSSL_VERSION_PTEXT; - const char *BF_options(void) { #ifdef BF_PTR diff --git a/crypto/bn/bn_lib.c b/crypto/bn/bn_lib.c index f10f44a86f..4e133ce8ca 100644 --- a/crypto/bn/bn_lib.c +++ b/crypto/bn/bn_lib.c @@ -66,8 +66,6 @@ #include "internal/cryptlib.h" #include "bn_lcl.h" -const char BN_version[] = "Big Number" OPENSSL_VERSION_PTEXT; - /* This stuff appears to be completely unused, so is deprecated */ #ifndef OPENSSL_NO_DEPRECATED /*- diff --git a/crypto/camellia/cmll_misc.c b/crypto/camellia/cmll_misc.c index 4e159061bd..d73499b5c5 100644 --- a/crypto/camellia/cmll_misc.c +++ b/crypto/camellia/cmll_misc.c @@ -53,8 +53,6 @@ #include #include "cmll_locl.h" -const char CAMELLIA_version[] = "CAMELLIA" OPENSSL_VERSION_PTEXT; - int Camellia_set_key(const unsigned char *userKey, const int bits, CAMELLIA_KEY *key) { diff --git a/crypto/cast/c_ecb.c b/crypto/cast/c_ecb.c index 4793f28edf..2430bb5faa 100644 --- a/crypto/cast/c_ecb.c +++ b/crypto/cast/c_ecb.c @@ -60,8 +60,6 @@ #include "cast_lcl.h" #include -const char CAST_version[] = "CAST" OPENSSL_VERSION_PTEXT; - void CAST_ecb_encrypt(const unsigned char *in, unsigned char *out, const CAST_KEY *ks, int enc) { diff --git a/crypto/conf/conf_def.c b/crypto/conf/conf_def.c index 098fc8ec32..b4903772e3 100644 --- a/crypto/conf/conf_def.c +++ b/crypto/conf/conf_def.c @@ -88,8 +88,6 @@ static int def_dump(const CONF *conf, BIO *bp); static int def_is_number(const CONF *conf, char c); static int def_to_int(const CONF *conf, char c); -const char CONF_def_version[] = "CONF_def" OPENSSL_VERSION_PTEXT; - static CONF_METHOD default_method = { "OpenSSL default", def_create, diff --git a/crypto/conf/conf_lib.c b/crypto/conf/conf_lib.c index 838a6456a4..12a061c263 100644 --- a/crypto/conf/conf_lib.c +++ b/crypto/conf/conf_lib.c @@ -64,8 +64,6 @@ #include #include -const char CONF_version[] = "CONF" OPENSSL_VERSION_PTEXT; - static CONF_METHOD *default_CONF_method = NULL; /* Init a 'CONF' structure from an old LHASH */ diff --git a/crypto/des/ecb_enc.c b/crypto/des/ecb_enc.c index f97fd971dc..d638a49328 100644 --- a/crypto/des/ecb_enc.c +++ b/crypto/des/ecb_enc.c @@ -61,8 +61,6 @@ #include #include -OPENSSL_GLOBAL const char libdes_version[] = "libdes" OPENSSL_VERSION_PTEXT; -OPENSSL_GLOBAL const char DES_version[] = "DES" OPENSSL_VERSION_PTEXT; const char *DES_options(void) { diff --git a/crypto/dh/dh_lib.c b/crypto/dh/dh_lib.c index cce2514bbf..4e087d0357 100644 --- a/crypto/dh/dh_lib.c +++ b/crypto/dh/dh_lib.c @@ -64,8 +64,6 @@ # include #endif -const char DH_version[] = "Diffie-Hellman" OPENSSL_VERSION_PTEXT; - static const DH_METHOD *default_DH_method = NULL; void DH_set_default_method(const DH_METHOD *meth) diff --git a/crypto/dsa/dsa_lib.c b/crypto/dsa/dsa_lib.c index cb59e7ebb0..a4a8163477 100644 --- a/crypto/dsa/dsa_lib.c +++ b/crypto/dsa/dsa_lib.c @@ -70,8 +70,6 @@ # include #endif -const char DSA_version[] = "DSA" OPENSSL_VERSION_PTEXT; - static const DSA_METHOD *default_DSA_method = NULL; void DSA_set_default_method(const DSA_METHOD *meth) diff --git a/crypto/ec/ec_lib.c b/crypto/ec/ec_lib.c index 3ddaa5d8fb..cd08a5553c 100644 --- a/crypto/ec/ec_lib.c +++ b/crypto/ec/ec_lib.c @@ -68,8 +68,6 @@ #include "ec_lcl.h" -const char EC_version[] = "EC" OPENSSL_VERSION_PTEXT; - /* functions for EC_GROUP objects */ EC_GROUP *EC_GROUP_new(const EC_METHOD *meth) diff --git a/crypto/ecdh/ech_lib.c b/crypto/ecdh/ech_lib.c index 62734bc96f..363d2fe23b 100644 --- a/crypto/ecdh/ech_lib.c +++ b/crypto/ecdh/ech_lib.c @@ -74,8 +74,6 @@ #endif #include -const char ECDH_version[] = "ECDH" OPENSSL_VERSION_PTEXT; - static const ECDH_METHOD *default_ECDH_method = NULL; static void *ecdh_data_new(void); diff --git a/crypto/ecdsa/ecs_lib.c b/crypto/ecdsa/ecs_lib.c index cabf6ecbf1..0db35346de 100644 --- a/crypto/ecdsa/ecs_lib.c +++ b/crypto/ecdsa/ecs_lib.c @@ -61,8 +61,6 @@ #include #include -const char ECDSA_version[] = "ECDSA" OPENSSL_VERSION_PTEXT; - static const ECDSA_METHOD *default_ECDSA_method = NULL; static void *ecdsa_data_new(void); diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c index 125556ea6f..405cbb0c1b 100644 --- a/crypto/evp/evp_enc.c +++ b/crypto/evp/evp_enc.c @@ -66,8 +66,6 @@ #endif #include "evp_locl.h" -const char EVP_version[] = "EVP" OPENSSL_VERSION_PTEXT; - void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *ctx) { memset(ctx, 0, sizeof(*ctx)); diff --git a/crypto/idea/i_ecb.c b/crypto/idea/i_ecb.c index a6b879a927..4ed206ecd1 100644 --- a/crypto/idea/i_ecb.c +++ b/crypto/idea/i_ecb.c @@ -60,8 +60,6 @@ #include "idea_lcl.h" #include -const char IDEA_version[] = "IDEA" OPENSSL_VERSION_PTEXT; - const char *idea_options(void) { if (sizeof(short) != sizeof(IDEA_INT)) diff --git a/crypto/lhash/lhash.c b/crypto/lhash/lhash.c index 083310e825..0c9ce8fe13 100644 --- a/crypto/lhash/lhash.c +++ b/crypto/lhash/lhash.c @@ -101,8 +101,6 @@ #include #include -const char lh_version[] = "lhash" OPENSSL_VERSION_PTEXT; - #undef MIN_NODES #define MIN_NODES 16 #define UP_LOAD (2*LH_LOAD_MULT) /* load times 256 (default 2) */ diff --git a/crypto/md2/md2_dgst.c b/crypto/md2/md2_dgst.c index 70c19fba31..bb0a7a34d2 100644 --- a/crypto/md2/md2_dgst.c +++ b/crypto/md2/md2_dgst.c @@ -63,8 +63,6 @@ #include #include -const char MD2_version[] = "MD2" OPENSSL_VERSION_PTEXT; - /* * Implemented from RFC1319 The MD2 Message-Digest Algorithm */ diff --git a/crypto/md4/md4_dgst.c b/crypto/md4/md4_dgst.c index 966cebe9f0..2b7881ee80 100644 --- a/crypto/md4/md4_dgst.c +++ b/crypto/md4/md4_dgst.c @@ -60,8 +60,6 @@ #include #include "md4_locl.h" -const char MD4_version[] = "MD4" OPENSSL_VERSION_PTEXT; - /* * Implemented from RFC1186 The MD4 Message-Digest Algorithm */ diff --git a/crypto/md5/md5_dgst.c b/crypto/md5/md5_dgst.c index 335126c76d..f73ca7c07c 100644 --- a/crypto/md5/md5_dgst.c +++ b/crypto/md5/md5_dgst.c @@ -60,8 +60,6 @@ #include "md5_locl.h" #include -const char MD5_version[] = "MD5" OPENSSL_VERSION_PTEXT; - /* * Implemented from RFC1321 The MD5 Message-Digest Algorithm */ diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c index 47be6406ae..23b347ff5e 100644 --- a/crypto/pem/pem_lib.c +++ b/crypto/pem/pem_lib.c @@ -74,8 +74,6 @@ # include #endif -const char PEM_version[] = "PEM" OPENSSL_VERSION_PTEXT; - #define MIN_LENGTH 4 static int load_iv(char **fromp, unsigned char *to, int num); diff --git a/crypto/rand/md_rand.c b/crypto/rand/md_rand.c index 27e785d311..c7d54ed7ef 100644 --- a/crypto/rand/md_rand.c +++ b/crypto/rand/md_rand.c @@ -164,8 +164,6 @@ static CRYPTO_THREADID locking_threadid; int rand_predictable = 0; #endif -const char RAND_version[] = "RAND" OPENSSL_VERSION_PTEXT; - static void rand_hw_seed(EVP_MD_CTX *ctx); static void ssleay_rand_cleanup(void); diff --git a/crypto/rc2/rc2_ecb.c b/crypto/rc2/rc2_ecb.c index 48442a3f39..4cb1a80aa7 100644 --- a/crypto/rc2/rc2_ecb.c +++ b/crypto/rc2/rc2_ecb.c @@ -60,8 +60,6 @@ #include "rc2_locl.h" #include -const char RC2_version[] = "RC2" OPENSSL_VERSION_PTEXT; - /*- * RC2 as implemented frm a posting from * Newsgroups: sci.crypt diff --git a/crypto/rc4/rc4_skey.c b/crypto/rc4/rc4_skey.c index ce382247ae..7b198bb091 100644 --- a/crypto/rc4/rc4_skey.c +++ b/crypto/rc4/rc4_skey.c @@ -60,8 +60,6 @@ #include "rc4_locl.h" #include -const char RC4_version[] = "RC4" OPENSSL_VERSION_PTEXT; - const char *RC4_options(void) { #ifdef RC4_INDEX diff --git a/crypto/rc5/rc5_ecb.c b/crypto/rc5/rc5_ecb.c index e657a93b9a..2b5fa2a82d 100644 --- a/crypto/rc5/rc5_ecb.c +++ b/crypto/rc5/rc5_ecb.c @@ -60,8 +60,6 @@ #include "rc5_locl.h" #include -const char RC5_version[] = "RC5" OPENSSL_VERSION_PTEXT; - void RC5_32_ecb_encrypt(const unsigned char *in, unsigned char *out, RC5_32_KEY *ks, int encrypt) { diff --git a/crypto/ripemd/rmd_dgst.c b/crypto/ripemd/rmd_dgst.c index 2496c11b46..f351df1d08 100644 --- a/crypto/ripemd/rmd_dgst.c +++ b/crypto/ripemd/rmd_dgst.c @@ -60,8 +60,6 @@ #include "rmd_locl.h" #include -const char RMD160_version[] = "RIPE-MD160" OPENSSL_VERSION_PTEXT; - #ifdef RMD160_ASM void ripemd160_block_x86(RIPEMD160_CTX *c, unsigned long *p, size_t num); # define ripemd160_block ripemd160_block_x86 diff --git a/crypto/rsa/rsa_lib.c b/crypto/rsa/rsa_lib.c index 2ec39e7e21..76c9796bf0 100644 --- a/crypto/rsa/rsa_lib.c +++ b/crypto/rsa/rsa_lib.c @@ -67,8 +67,6 @@ # include #endif -const char RSA_version[] = "RSA" OPENSSL_VERSION_PTEXT; - static const RSA_METHOD *default_RSA_meth = NULL; RSA *RSA_new(void) diff --git a/crypto/sha/sha1dgst.c b/crypto/sha/sha1dgst.c index 9f1b8f0630..a6c63382bb 100644 --- a/crypto/sha/sha1dgst.c +++ b/crypto/sha/sha1dgst.c @@ -61,8 +61,6 @@ # include -const char SHA1_version[] = "SHA1" OPENSSL_VERSION_PTEXT; - /* The implementation is in ../md32_common.h */ # include "sha_locl.h" diff --git a/crypto/sha/sha256.c b/crypto/sha/sha256.c index c112b04e7d..096981b1a5 100644 --- a/crypto/sha/sha256.c +++ b/crypto/sha/sha256.c @@ -13,8 +13,6 @@ #include #include -const char SHA256_version[] = "SHA-256" OPENSSL_VERSION_PTEXT; - int SHA224_Init(SHA256_CTX *c) { memset(c, 0, sizeof(*c)); diff --git a/crypto/sha/sha512.c b/crypto/sha/sha512.c index ebae411f13..427cdf5ea0 100644 --- a/crypto/sha/sha512.c +++ b/crypto/sha/sha512.c @@ -49,8 +49,6 @@ #include "internal/cryptlib.h" -const char SHA512_version[] = "SHA-512" OPENSSL_VERSION_PTEXT; - #if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \ defined(__x86_64) || defined(_M_AMD64) || defined(_M_X64) || \ defined(__s390__) || defined(__s390x__) || \ diff --git a/crypto/stack/stack.c b/crypto/stack/stack.c index a6182df380..c7643dbef5 100644 --- a/crypto/stack/stack.c +++ b/crypto/stack/stack.c @@ -71,8 +71,6 @@ struct stack_st { #undef MIN_NODES #define MIN_NODES 4 -const char STACK_version[] = "Stack" OPENSSL_VERSION_PTEXT; - #include int (*sk_set_cmp_func(_STACK *sk, int (*c) (const void *, const void *))) diff --git a/crypto/txt_db/txt_db.c b/crypto/txt_db/txt_db.c index 5b1e5925d0..2c4d2cd1be 100644 --- a/crypto/txt_db/txt_db.c +++ b/crypto/txt_db/txt_db.c @@ -66,8 +66,6 @@ #undef BUFSIZE #define BUFSIZE 512 -const char TXT_DB_version[] = "TXT_DB" OPENSSL_VERSION_PTEXT; - TXT_DB *TXT_DB_read(BIO *in, int num) { TXT_DB *ret = NULL; diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c index df012ddeb0..26867cb4c2 100644 --- a/crypto/x509/x509_vfy.c +++ b/crypto/x509/x509_vfy.c @@ -138,7 +138,6 @@ static int check_crl_chain(X509_STORE_CTX *ctx, STACK_OF(X509) *crl_path); static int internal_verify(X509_STORE_CTX *ctx); -const char X509_version[] = "X.509" OPENSSL_VERSION_PTEXT; static int null_callback(int ok, X509_STORE_CTX *e) { diff --git a/include/openssl/opensslv.h b/include/openssl/opensslv.h index 97c27e79ea..5b6abdf800 100644 --- a/include/openssl/opensslv.h +++ b/include/openssl/opensslv.h @@ -36,7 +36,6 @@ extern "C" { # else # define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0-dev xx XXX xxxx" # endif -# define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT /*- * The macros below are to be used for shared library (.so, .dll, ...) diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c index c0ed8fb852..fc1887ab35 100644 --- a/ssl/d1_lib.c +++ b/ssl/d1_lib.c @@ -75,7 +75,6 @@ static void get_current_time(struct timeval *t); static int dtls1_set_handshake_header(SSL *s, int type, unsigned long len); static int dtls1_handshake_write(SSL *s); -const char dtls1_version_str[] = "DTLSv1" OPENSSL_VERSION_PTEXT; int dtls1_listen(SSL *s, struct sockaddr *client); const SSL3_ENC_METHOD DTLSv1_enc_data = { diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index d39346af65..83b8f686bb 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -157,8 +157,6 @@ #endif #include -const char ssl3_version_str[] = "SSLv3" OPENSSL_VERSION_PTEXT; - #define SSL3_NUM_CIPHERS OSSL_NELEM(ssl3_ciphers) /* list of available SSLv3 ciphers (sorted by id) */ diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index c0dd35f9c8..ece2b72ac6 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -121,8 +121,6 @@ #endif #include "ssl_locl.h" -const char tls1_version_str[] = "TLSv1" OPENSSL_VERSION_PTEXT; - static int tls_decrypt_ticket(SSL *s, const unsigned char *tick, int ticklen, const unsigned char *sess_id, int sesslen, SSL_SESSION **psess); -- 2.40.0