RT3999: Remove sub-component version strings

Especially since after the #ifdef cleanups this is not useful.

Reviewed-by: Matt Caswell <matt@openssl.org>
This commit is contained in:
Rich Salz
2015-08-07 17:09:30 -04:00
committed by Rich Salz
parent 82c494276d
commit fbfcb22439
37 changed files with 0 additions and 70 deletions

View File

@@ -53,8 +53,6 @@
#include <openssl/aes.h> #include <openssl/aes.h>
#include "aes_locl.h" #include "aes_locl.h"
const char AES_version[] = "AES" OPENSSL_VERSION_PTEXT;
const char *AES_options(void) const char *AES_options(void)
{ {
#ifdef FULL_UNROLL #ifdef FULL_UNROLL

View File

@@ -64,7 +64,6 @@
static int asn1_get_length(const unsigned char **pp, int *inf, long *rl, static int asn1_get_length(const unsigned char **pp, int *inf, long *rl,
int max); int max);
static void asn1_put_length(unsigned char **pp, int length); 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) static int _asn1_check_infinite_end(const unsigned char **p, long len)
{ {

View File

@@ -66,8 +66,6 @@
* SECURITY WORKSHOP, CAMBRIDGE, U.K., DECEMBER 9-11, 1993) * SECURITY WORKSHOP, CAMBRIDGE, U.K., DECEMBER 9-11, 1993)
*/ */
const char BF_version[] = "Blowfish" OPENSSL_VERSION_PTEXT;
const char *BF_options(void) const char *BF_options(void)
{ {
#ifdef BF_PTR #ifdef BF_PTR

View File

@@ -66,8 +66,6 @@
#include "internal/cryptlib.h" #include "internal/cryptlib.h"
#include "bn_lcl.h" #include "bn_lcl.h"
const char BN_version[] = "Big Number" OPENSSL_VERSION_PTEXT;
/* This stuff appears to be completely unused, so is deprecated */ /* This stuff appears to be completely unused, so is deprecated */
#ifndef OPENSSL_NO_DEPRECATED #ifndef OPENSSL_NO_DEPRECATED
/*- /*-

View File

@@ -53,8 +53,6 @@
#include <openssl/camellia.h> #include <openssl/camellia.h>
#include "cmll_locl.h" #include "cmll_locl.h"
const char CAMELLIA_version[] = "CAMELLIA" OPENSSL_VERSION_PTEXT;
int Camellia_set_key(const unsigned char *userKey, const int bits, int Camellia_set_key(const unsigned char *userKey, const int bits,
CAMELLIA_KEY *key) CAMELLIA_KEY *key)
{ {

View File

@@ -60,8 +60,6 @@
#include "cast_lcl.h" #include "cast_lcl.h"
#include <openssl/opensslv.h> #include <openssl/opensslv.h>
const char CAST_version[] = "CAST" OPENSSL_VERSION_PTEXT;
void CAST_ecb_encrypt(const unsigned char *in, unsigned char *out, void CAST_ecb_encrypt(const unsigned char *in, unsigned char *out,
const CAST_KEY *ks, int enc) const CAST_KEY *ks, int enc)
{ {

View File

@@ -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_is_number(const CONF *conf, char c);
static int def_to_int(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 = { static CONF_METHOD default_method = {
"OpenSSL default", "OpenSSL default",
def_create, def_create,

View File

@@ -64,8 +64,6 @@
#include <openssl/conf_api.h> #include <openssl/conf_api.h>
#include <openssl/lhash.h> #include <openssl/lhash.h>
const char CONF_version[] = "CONF" OPENSSL_VERSION_PTEXT;
static CONF_METHOD *default_CONF_method = NULL; static CONF_METHOD *default_CONF_method = NULL;
/* Init a 'CONF' structure from an old LHASH */ /* Init a 'CONF' structure from an old LHASH */

View File

@@ -61,8 +61,6 @@
#include <openssl/opensslv.h> #include <openssl/opensslv.h>
#include <openssl/bio.h> #include <openssl/bio.h>
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) const char *DES_options(void)
{ {

View File

@@ -64,8 +64,6 @@
# include <openssl/engine.h> # include <openssl/engine.h>
#endif #endif
const char DH_version[] = "Diffie-Hellman" OPENSSL_VERSION_PTEXT;
static const DH_METHOD *default_DH_method = NULL; static const DH_METHOD *default_DH_method = NULL;
void DH_set_default_method(const DH_METHOD *meth) void DH_set_default_method(const DH_METHOD *meth)

View File

@@ -70,8 +70,6 @@
# include <openssl/dh.h> # include <openssl/dh.h>
#endif #endif
const char DSA_version[] = "DSA" OPENSSL_VERSION_PTEXT;
static const DSA_METHOD *default_DSA_method = NULL; static const DSA_METHOD *default_DSA_method = NULL;
void DSA_set_default_method(const DSA_METHOD *meth) void DSA_set_default_method(const DSA_METHOD *meth)

View File

@@ -68,8 +68,6 @@
#include "ec_lcl.h" #include "ec_lcl.h"
const char EC_version[] = "EC" OPENSSL_VERSION_PTEXT;
/* functions for EC_GROUP objects */ /* functions for EC_GROUP objects */
EC_GROUP *EC_GROUP_new(const EC_METHOD *meth) EC_GROUP *EC_GROUP_new(const EC_METHOD *meth)

View File

@@ -74,8 +74,6 @@
#endif #endif
#include <openssl/err.h> #include <openssl/err.h>
const char ECDH_version[] = "ECDH" OPENSSL_VERSION_PTEXT;
static const ECDH_METHOD *default_ECDH_method = NULL; static const ECDH_METHOD *default_ECDH_method = NULL;
static void *ecdh_data_new(void); static void *ecdh_data_new(void);

View File

@@ -61,8 +61,6 @@
#include <openssl/err.h> #include <openssl/err.h>
#include <openssl/bn.h> #include <openssl/bn.h>
const char ECDSA_version[] = "ECDSA" OPENSSL_VERSION_PTEXT;
static const ECDSA_METHOD *default_ECDSA_method = NULL; static const ECDSA_METHOD *default_ECDSA_method = NULL;
static void *ecdsa_data_new(void); static void *ecdsa_data_new(void);

View File

@@ -66,8 +66,6 @@
#endif #endif
#include "evp_locl.h" #include "evp_locl.h"
const char EVP_version[] = "EVP" OPENSSL_VERSION_PTEXT;
void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *ctx) void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *ctx)
{ {
memset(ctx, 0, sizeof(*ctx)); memset(ctx, 0, sizeof(*ctx));

View File

@@ -60,8 +60,6 @@
#include "idea_lcl.h" #include "idea_lcl.h"
#include <openssl/opensslv.h> #include <openssl/opensslv.h>
const char IDEA_version[] = "IDEA" OPENSSL_VERSION_PTEXT;
const char *idea_options(void) const char *idea_options(void)
{ {
if (sizeof(short) != sizeof(IDEA_INT)) if (sizeof(short) != sizeof(IDEA_INT))

View File

@@ -101,8 +101,6 @@
#include <openssl/crypto.h> #include <openssl/crypto.h>
#include <openssl/lhash.h> #include <openssl/lhash.h>
const char lh_version[] = "lhash" OPENSSL_VERSION_PTEXT;
#undef MIN_NODES #undef MIN_NODES
#define MIN_NODES 16 #define MIN_NODES 16
#define UP_LOAD (2*LH_LOAD_MULT) /* load times 256 (default 2) */ #define UP_LOAD (2*LH_LOAD_MULT) /* load times 256 (default 2) */

View File

@@ -63,8 +63,6 @@
#include <openssl/opensslv.h> #include <openssl/opensslv.h>
#include <openssl/crypto.h> #include <openssl/crypto.h>
const char MD2_version[] = "MD2" OPENSSL_VERSION_PTEXT;
/* /*
* Implemented from RFC1319 The MD2 Message-Digest Algorithm * Implemented from RFC1319 The MD2 Message-Digest Algorithm
*/ */

View File

@@ -60,8 +60,6 @@
#include <openssl/opensslv.h> #include <openssl/opensslv.h>
#include "md4_locl.h" #include "md4_locl.h"
const char MD4_version[] = "MD4" OPENSSL_VERSION_PTEXT;
/* /*
* Implemented from RFC1186 The MD4 Message-Digest Algorithm * Implemented from RFC1186 The MD4 Message-Digest Algorithm
*/ */

View File

@@ -60,8 +60,6 @@
#include "md5_locl.h" #include "md5_locl.h"
#include <openssl/opensslv.h> #include <openssl/opensslv.h>
const char MD5_version[] = "MD5" OPENSSL_VERSION_PTEXT;
/* /*
* Implemented from RFC1321 The MD5 Message-Digest Algorithm * Implemented from RFC1321 The MD5 Message-Digest Algorithm
*/ */

View File

@@ -74,8 +74,6 @@
# include <openssl/engine.h> # include <openssl/engine.h>
#endif #endif
const char PEM_version[] = "PEM" OPENSSL_VERSION_PTEXT;
#define MIN_LENGTH 4 #define MIN_LENGTH 4
static int load_iv(char **fromp, unsigned char *to, int num); static int load_iv(char **fromp, unsigned char *to, int num);

View File

@@ -164,8 +164,6 @@ static CRYPTO_THREADID locking_threadid;
int rand_predictable = 0; int rand_predictable = 0;
#endif #endif
const char RAND_version[] = "RAND" OPENSSL_VERSION_PTEXT;
static void rand_hw_seed(EVP_MD_CTX *ctx); static void rand_hw_seed(EVP_MD_CTX *ctx);
static void ssleay_rand_cleanup(void); static void ssleay_rand_cleanup(void);

View File

@@ -60,8 +60,6 @@
#include "rc2_locl.h" #include "rc2_locl.h"
#include <openssl/opensslv.h> #include <openssl/opensslv.h>
const char RC2_version[] = "RC2" OPENSSL_VERSION_PTEXT;
/*- /*-
* RC2 as implemented frm a posting from * RC2 as implemented frm a posting from
* Newsgroups: sci.crypt * Newsgroups: sci.crypt

View File

@@ -60,8 +60,6 @@
#include "rc4_locl.h" #include "rc4_locl.h"
#include <openssl/opensslv.h> #include <openssl/opensslv.h>
const char RC4_version[] = "RC4" OPENSSL_VERSION_PTEXT;
const char *RC4_options(void) const char *RC4_options(void)
{ {
#ifdef RC4_INDEX #ifdef RC4_INDEX

View File

@@ -60,8 +60,6 @@
#include "rc5_locl.h" #include "rc5_locl.h"
#include <openssl/opensslv.h> #include <openssl/opensslv.h>
const char RC5_version[] = "RC5" OPENSSL_VERSION_PTEXT;
void RC5_32_ecb_encrypt(const unsigned char *in, unsigned char *out, void RC5_32_ecb_encrypt(const unsigned char *in, unsigned char *out,
RC5_32_KEY *ks, int encrypt) RC5_32_KEY *ks, int encrypt)
{ {

View File

@@ -60,8 +60,6 @@
#include "rmd_locl.h" #include "rmd_locl.h"
#include <openssl/opensslv.h> #include <openssl/opensslv.h>
const char RMD160_version[] = "RIPE-MD160" OPENSSL_VERSION_PTEXT;
#ifdef RMD160_ASM #ifdef RMD160_ASM
void ripemd160_block_x86(RIPEMD160_CTX *c, unsigned long *p, size_t num); void ripemd160_block_x86(RIPEMD160_CTX *c, unsigned long *p, size_t num);
# define ripemd160_block ripemd160_block_x86 # define ripemd160_block ripemd160_block_x86

View File

@@ -67,8 +67,6 @@
# include <openssl/engine.h> # include <openssl/engine.h>
#endif #endif
const char RSA_version[] = "RSA" OPENSSL_VERSION_PTEXT;
static const RSA_METHOD *default_RSA_meth = NULL; static const RSA_METHOD *default_RSA_meth = NULL;
RSA *RSA_new(void) RSA *RSA_new(void)

View File

@@ -61,8 +61,6 @@
# include <openssl/opensslv.h> # include <openssl/opensslv.h>
const char SHA1_version[] = "SHA1" OPENSSL_VERSION_PTEXT;
/* The implementation is in ../md32_common.h */ /* The implementation is in ../md32_common.h */
# include "sha_locl.h" # include "sha_locl.h"

View File

@@ -13,8 +13,6 @@
#include <openssl/sha.h> #include <openssl/sha.h>
#include <openssl/opensslv.h> #include <openssl/opensslv.h>
const char SHA256_version[] = "SHA-256" OPENSSL_VERSION_PTEXT;
int SHA224_Init(SHA256_CTX *c) int SHA224_Init(SHA256_CTX *c)
{ {
memset(c, 0, sizeof(*c)); memset(c, 0, sizeof(*c));

View File

@@ -49,8 +49,6 @@
#include "internal/cryptlib.h" #include "internal/cryptlib.h"
const char SHA512_version[] = "SHA-512" OPENSSL_VERSION_PTEXT;
#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \ #if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
defined(__x86_64) || defined(_M_AMD64) || defined(_M_X64) || \ defined(__x86_64) || defined(_M_AMD64) || defined(_M_X64) || \
defined(__s390__) || defined(__s390x__) || \ defined(__s390__) || defined(__s390x__) || \

View File

@@ -71,8 +71,6 @@ struct stack_st {
#undef MIN_NODES #undef MIN_NODES
#define MIN_NODES 4 #define MIN_NODES 4
const char STACK_version[] = "Stack" OPENSSL_VERSION_PTEXT;
#include <errno.h> #include <errno.h>
int (*sk_set_cmp_func(_STACK *sk, int (*c) (const void *, const void *))) int (*sk_set_cmp_func(_STACK *sk, int (*c) (const void *, const void *)))

View File

@@ -66,8 +66,6 @@
#undef BUFSIZE #undef BUFSIZE
#define BUFSIZE 512 #define BUFSIZE 512
const char TXT_DB_version[] = "TXT_DB" OPENSSL_VERSION_PTEXT;
TXT_DB *TXT_DB_read(BIO *in, int num) TXT_DB *TXT_DB_read(BIO *in, int num)
{ {
TXT_DB *ret = NULL; TXT_DB *ret = NULL;

View File

@@ -138,7 +138,6 @@ static int check_crl_chain(X509_STORE_CTX *ctx,
STACK_OF(X509) *crl_path); STACK_OF(X509) *crl_path);
static int internal_verify(X509_STORE_CTX *ctx); 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) static int null_callback(int ok, X509_STORE_CTX *e)
{ {

View File

@@ -36,7 +36,6 @@ extern "C" {
# else # else
# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0-dev xx XXX xxxx" # define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0-dev xx XXX xxxx"
# endif # endif
# define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
/*- /*-
* The macros below are to be used for shared library (.so, .dll, ...) * The macros below are to be used for shared library (.so, .dll, ...)

View File

@@ -75,7 +75,6 @@
static void get_current_time(struct timeval *t); static void get_current_time(struct timeval *t);
static int dtls1_set_handshake_header(SSL *s, int type, unsigned long len); static int dtls1_set_handshake_header(SSL *s, int type, unsigned long len);
static int dtls1_handshake_write(SSL *s); static int dtls1_handshake_write(SSL *s);
const char dtls1_version_str[] = "DTLSv1" OPENSSL_VERSION_PTEXT;
int dtls1_listen(SSL *s, struct sockaddr *client); int dtls1_listen(SSL *s, struct sockaddr *client);
const SSL3_ENC_METHOD DTLSv1_enc_data = { const SSL3_ENC_METHOD DTLSv1_enc_data = {

View File

@@ -157,8 +157,6 @@
#endif #endif
#include <openssl/rand.h> #include <openssl/rand.h>
const char ssl3_version_str[] = "SSLv3" OPENSSL_VERSION_PTEXT;
#define SSL3_NUM_CIPHERS OSSL_NELEM(ssl3_ciphers) #define SSL3_NUM_CIPHERS OSSL_NELEM(ssl3_ciphers)
/* list of available SSLv3 ciphers (sorted by id) */ /* list of available SSLv3 ciphers (sorted by id) */

View File

@@ -121,8 +121,6 @@
#endif #endif
#include "ssl_locl.h" #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, static int tls_decrypt_ticket(SSL *s, const unsigned char *tick, int ticklen,
const unsigned char *sess_id, int sesslen, const unsigned char *sess_id, int sesslen,
SSL_SESSION **psess); SSL_SESSION **psess);