From 5f32680329648886701f5b5832239eecf0b38390 Mon Sep 17 00:00:00 2001 From: "Ralf S. Engelschall" Date: Wed, 23 Dec 1998 07:53:55 +0000 Subject: [PATCH] Switch version string to SSLeay/OpenSSL --- README | 2 +- crypto/asn1/asn1_lib.c | 2 +- crypto/bf/bf_ecb.c | 2 +- crypto/bn/bn_lib.c | 2 +- crypto/cast/c_ecb.c | 2 +- crypto/conf/conf.c | 2 +- crypto/crypto.h | 6 ++++-- crypto/cversion.c | 2 +- crypto/des/ecb_enc.c | 2 +- crypto/dh/dh_lib.c | 2 +- crypto/dsa/dsa_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/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/sha_dgst.c | 2 +- crypto/stack/stack.c | 2 +- crypto/txt_db/txt_db.c | 2 +- crypto/x509/x509_vfy.c | 2 +- ssl/s23_lib.c | 2 +- ssl/s2_lib.c | 2 +- ssl/s3_lib.c | 2 +- ssl/ssl_lib.c | 2 +- ssl/t1_lib.c | 2 +- util/up_ver.pl | 4 ++-- 34 files changed, 38 insertions(+), 36 deletions(-) diff --git a/README b/README index 814ee5a338..e11ac91ce4 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ - OpenSSL 0.9.1c 22-Dec-1998 + SSLeay/OpenSSL 0.9.1c 23-Dec-1998 Copyright (c) 1998 The OpenSSL Project Copyright (c) 1995-1998 Eric Young diff --git a/crypto/asn1/asn1_lib.c b/crypto/asn1/asn1_lib.c index 117ccbfebb..09c6dfe6c0 100644 --- a/crypto/asn1/asn1_lib.c +++ b/crypto/asn1/asn1_lib.c @@ -69,7 +69,7 @@ static int asn1_get_length(); static void asn1_put_length(); #endif -char *ASN1_version="ASN.1 part of SSLeay 0.9.1c 22-Dec-1998"; +char *ASN1_version="ASN.1 part of SSLeay/OpenSSL 0.9.1c 23-Dec-1998"; int ASN1_check_infinite_end(p,len) unsigned char **p; diff --git a/crypto/bf/bf_ecb.c b/crypto/bf/bf_ecb.c index 96877271fd..b72fc850e4 100644 --- a/crypto/bf/bf_ecb.c +++ b/crypto/bf/bf_ecb.c @@ -64,7 +64,7 @@ * CAMBRIDGE SECURITY WORKSHOP, CAMBRIDGE, U.K., DECEMBER 9-11, 1993) */ -char *BF_version="BlowFish part of SSLeay 0.9.1c 22-Dec-1998"; +char *BF_version="BlowFish part of SSLeay/OpenSSL 0.9.1c 23-Dec-1998"; char *BF_options() { diff --git a/crypto/bn/bn_lib.c b/crypto/bn/bn_lib.c index 9f3d0f3c5e..ebe385071e 100644 --- a/crypto/bn/bn_lib.c +++ b/crypto/bn/bn_lib.c @@ -60,7 +60,7 @@ #include "cryptlib.h" #include "bn_lcl.h" -char *BN_version="Big Number part of SSLeay 0.9.1c 22-Dec-1998"; +char *BN_version="Big Number part of SSLeay/OpenSSL 0.9.1c 23-Dec-1998"; /* For a 32 bit machine * 2 - 4 == 128 diff --git a/crypto/cast/c_ecb.c b/crypto/cast/c_ecb.c index b9d30a5b54..ee02658d61 100644 --- a/crypto/cast/c_ecb.c +++ b/crypto/cast/c_ecb.c @@ -59,7 +59,7 @@ #include "cast.h" #include "cast_lcl.h" -char *CAST_version="CAST part of SSLeay 0.9.1c 22-Dec-1998"; +char *CAST_version="CAST part of SSLeay/OpenSSL 0.9.1c 23-Dec-1998"; void CAST_ecb_encrypt(in, out, ks, encrypt) unsigned char *in; diff --git a/crypto/conf/conf.c b/crypto/conf/conf.c index c9d9cf90e6..845c361dad 100644 --- a/crypto/conf/conf.c +++ b/crypto/conf/conf.c @@ -95,7 +95,7 @@ static CONF_VALUE *get_section(); #define scan_esc(p) ((((p)[1] == '\0')?(p++):(p+=2)),p) -char *CONF_version="CONF part of SSLeay 0.9.1c 22-Dec-1998"; +char *CONF_version="CONF part of SSLeay/OpenSSL 0.9.1c 23-Dec-1998"; LHASH *CONF_load(h,file,line) LHASH *h; diff --git a/crypto/crypto.h b/crypto/crypto.h index 14fa6f4306..5f9c43edde 100644 --- a/crypto/crypto.h +++ b/crypto/crypto.h @@ -65,10 +65,12 @@ extern "C" { #include "stack.h" +#define OPENSSL_VERSION_NUMBER 0x0913 /* Version 0.9.1c is 0913 */ + +/* Backward compatibility to SSLeay */ /* This is more to be used to check the correct DLL is being used * in the MS world. */ -#define SSLEAY_VERSION_NUMBER 0x0913 /* Version 0.5.1c would be 0513 */ - +#define SSLEAY_VERSION_NUMBER OPENSSL_VERSION_NUMBER #define SSLEAY_VERSION 0 /* #define SSLEAY_OPTIONS 1 no longer supported */ #define SSLEAY_CFLAGS 2 diff --git a/crypto/cversion.c b/crypto/cversion.c index 28e20a263b..b8ab30ec12 100644 --- a/crypto/cversion.c +++ b/crypto/cversion.c @@ -66,7 +66,7 @@ char *SSLeay_version(t) int t; { if (t == SSLEAY_VERSION) - return("SSLeay 0.9.1c 22-Dec-1998"); + return("SSLeay/OpenSSL 0.9.1c 23-Dec-1998"); if (t == SSLEAY_BUILT_ON) { #ifdef DATE diff --git a/crypto/des/ecb_enc.c b/crypto/des/ecb_enc.c index 3970c6d8b5..400b2f4228 100644 --- a/crypto/des/ecb_enc.c +++ b/crypto/des/ecb_enc.c @@ -60,7 +60,7 @@ #include "spr.h" char *libdes_version="libdes v 3.24 - 20-Apr-1996 - eay"; -char *DES_version="DES part of SSLeay 0.9.1c 22-Dec-1998"; +char *DES_version="DES part of SSLeay/OpenSSL 0.9.1c 23-Dec-1998"; char *des_options() { diff --git a/crypto/dh/dh_lib.c b/crypto/dh/dh_lib.c index a4abcb2e8e..22c044d51b 100644 --- a/crypto/dh/dh_lib.c +++ b/crypto/dh/dh_lib.c @@ -61,7 +61,7 @@ #include "bn.h" #include "dh.h" -char *DH_version="Diffie-Hellman part of SSLeay 0.9.1c 22-Dec-1998"; +char *DH_version="Diffie-Hellman part of SSLeay/OpenSSL 0.9.1c 23-Dec-1998"; DH *DH_new() { diff --git a/crypto/dsa/dsa_lib.c b/crypto/dsa/dsa_lib.c index 405807aad6..f4400706e7 100644 --- a/crypto/dsa/dsa_lib.c +++ b/crypto/dsa/dsa_lib.c @@ -64,7 +64,7 @@ #include "dsa.h" #include "asn1.h" -char *DSA_version="DSA part of SSLeay 0.9.1c 22-Dec-1998"; +char *DSA_version="DSA part of SSLeay/OpenSSL 0.9.1c 23-Dec-1998"; DSA *DSA_new() { diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c index 9e77ac1326..e72c5c11f2 100644 --- a/crypto/evp/evp_enc.c +++ b/crypto/evp/evp_enc.c @@ -60,7 +60,7 @@ #include "cryptlib.h" #include "evp.h" -char *EVP_version="EVP part of SSLeay 0.9.1c 22-Dec-1998"; +char *EVP_version="EVP part of SSLeay/OpenSSL 0.9.1c 23-Dec-1998"; void EVP_CIPHER_CTX_init(ctx) EVP_CIPHER_CTX *ctx; diff --git a/crypto/idea/i_ecb.c b/crypto/idea/i_ecb.c index 65ddd8e118..ab721e1d51 100644 --- a/crypto/idea/i_ecb.c +++ b/crypto/idea/i_ecb.c @@ -59,7 +59,7 @@ #include "idea.h" #include "idea_lcl.h" -char *IDEA_version="IDEA part of SSLeay 0.9.1c 22-Dec-1998"; +char *IDEA_version="IDEA part of SSLeay/OpenSSL 0.9.1c 23-Dec-1998"; char *idea_options() { diff --git a/crypto/lhash/lhash.c b/crypto/lhash/lhash.c index 6186a163d6..70d24351fa 100644 --- a/crypto/lhash/lhash.c +++ b/crypto/lhash/lhash.c @@ -56,7 +56,7 @@ * [including the GNU Public Licence.] */ -char *lh_version="lhash part of SSLeay 0.9.1c 22-Dec-1998"; +char *lh_version="lhash part of SSLeay/OpenSSL 0.9.1c 23-Dec-1998"; /* Code for dynamic hash table routines * Author - Eric Young v 2.0 diff --git a/crypto/md2/md2_dgst.c b/crypto/md2/md2_dgst.c index 09a0f417e1..7dbf05a6b7 100644 --- a/crypto/md2/md2_dgst.c +++ b/crypto/md2/md2_dgst.c @@ -61,7 +61,7 @@ #include #include "md2.h" -char *MD2_version="MD2 part of SSLeay 0.9.1c 22-Dec-1998"; +char *MD2_version="MD2 part of SSLeay/OpenSSL 0.9.1c 23-Dec-1998"; /* Implemented from RFC1319 The MD2 Message-Digest Algorithm */ diff --git a/crypto/md5/md5_dgst.c b/crypto/md5/md5_dgst.c index 9aad94678b..f4050037f2 100644 --- a/crypto/md5/md5_dgst.c +++ b/crypto/md5/md5_dgst.c @@ -59,7 +59,7 @@ #include #include "md5_locl.h" -char *MD5_version="MD5 part of SSLeay 0.9.1c 22-Dec-1998"; +char *MD5_version="MD5 part of SSLeay/OpenSSL 0.9.1c 23-Dec-1998"; /* Implemented from RFC1321 The MD5 Message-Digest Algorithm */ diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c index bd33244d81..103eb8e4fb 100644 --- a/crypto/pem/pem_lib.c +++ b/crypto/pem/pem_lib.c @@ -68,7 +68,7 @@ #include "des.h" #endif -char *PEM_version="PEM part of SSLeay 0.9.1c 22-Dec-1998"; +char *PEM_version="PEM part of SSLeay/OpenSSL 0.9.1c 23-Dec-1998"; #define MIN_LENGTH 4 diff --git a/crypto/rand/md_rand.c b/crypto/rand/md_rand.c index c1c99163d2..aa82eff8c9 100644 --- a/crypto/rand/md_rand.c +++ b/crypto/rand/md_rand.c @@ -126,7 +126,7 @@ static unsigned char state[STATE_SIZE+MD_DIGEST_LENGTH]; static unsigned char md[MD_DIGEST_LENGTH]; static long md_count[2]={0,0}; -char *RAND_version="RAND part of SSLeay 0.9.1c 22-Dec-1998"; +char *RAND_version="RAND part of SSLeay/OpenSSL 0.9.1c 23-Dec-1998"; static void ssleay_rand_cleanup(void); static void ssleay_rand_seed(unsigned char *buf, int num); diff --git a/crypto/rc2/rc2_ecb.c b/crypto/rc2/rc2_ecb.c index e54c3f2fbb..fb408fbc90 100644 --- a/crypto/rc2/rc2_ecb.c +++ b/crypto/rc2/rc2_ecb.c @@ -59,7 +59,7 @@ #include "rc2.h" #include "rc2_locl.h" -char *RC2_version="RC2 part of SSLeay 0.9.1c 22-Dec-1998"; +char *RC2_version="RC2 part of SSLeay/OpenSSL 0.9.1c 23-Dec-1998"; /* 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 a78128b6a7..3f41bdd917 100644 --- a/crypto/rc4/rc4_skey.c +++ b/crypto/rc4/rc4_skey.c @@ -59,7 +59,7 @@ #include "rc4.h" #include "rc4_locl.h" -char *RC4_version="RC4 part of SSLeay 0.9.1c 22-Dec-1998"; +char *RC4_version="RC4 part of SSLeay/OpenSSL 0.9.1c 23-Dec-1998"; char *RC4_options() { diff --git a/crypto/rc5/rc5_ecb.c b/crypto/rc5/rc5_ecb.c index 478c1c581d..a3bce21a2c 100644 --- a/crypto/rc5/rc5_ecb.c +++ b/crypto/rc5/rc5_ecb.c @@ -59,7 +59,7 @@ #include "rc5.h" #include "rc5_locl.h" -char *RC5_version="RC5 part of SSLeay 0.9.1c 22-Dec-1998"; +char *RC5_version="RC5 part of SSLeay/OpenSSL 0.9.1c 23-Dec-1998"; void RC5_32_ecb_encrypt(in, out, ks, encrypt) unsigned char *in; diff --git a/crypto/ripemd/rmd_dgst.c b/crypto/ripemd/rmd_dgst.c index c375ee6ac6..5507876544 100644 --- a/crypto/ripemd/rmd_dgst.c +++ b/crypto/ripemd/rmd_dgst.c @@ -59,7 +59,7 @@ #include #include "rmd_locl.h" -char *RMD160_version="RIPE-MD160 part of SSLeay 0.9.1c 22-Dec-1998"; +char *RMD160_version="RIPE-MD160 part of SSLeay/OpenSSL 0.9.1c 23-Dec-1998"; #ifndef NOPROTO # ifdef RMD160_ASM diff --git a/crypto/rsa/rsa_lib.c b/crypto/rsa/rsa_lib.c index 68c1d24ca0..0269b372c5 100644 --- a/crypto/rsa/rsa_lib.c +++ b/crypto/rsa/rsa_lib.c @@ -63,7 +63,7 @@ #include "bn.h" #include "rsa.h" -char *RSA_version="RSA part of SSLeay 0.9.1c 22-Dec-1998"; +char *RSA_version="RSA part of SSLeay/OpenSSL 0.9.1c 23-Dec-1998"; static RSA_METHOD *default_RSA_meth=NULL; static int rsa_meth_num=0; diff --git a/crypto/sha/sha1dgst.c b/crypto/sha/sha1dgst.c index be85f9352c..32b06f7380 100644 --- a/crypto/sha/sha1dgst.c +++ b/crypto/sha/sha1dgst.c @@ -63,7 +63,7 @@ #include "sha.h" #include "sha_locl.h" -char *SHA1_version="SHA1 part of SSLeay 0.9.1c 22-Dec-1998"; +char *SHA1_version="SHA1 part of SSLeay/OpenSSL 0.9.1c 23-Dec-1998"; /* Implemented from SHA-1 document - The Secure Hash Algorithm */ diff --git a/crypto/sha/sha_dgst.c b/crypto/sha/sha_dgst.c index 8f3165cc9e..863ad18c09 100644 --- a/crypto/sha/sha_dgst.c +++ b/crypto/sha/sha_dgst.c @@ -63,7 +63,7 @@ #include "sha.h" #include "sha_locl.h" -char *SHA_version="SHA part of SSLeay 0.9.1c 22-Dec-1998"; +char *SHA_version="SHA part of SSLeay/OpenSSL 0.9.1c 23-Dec-1998"; /* Implemented from SHA-0 document - The Secure Hash Algorithm */ diff --git a/crypto/stack/stack.c b/crypto/stack/stack.c index a2ea9b14e8..31ea16a00c 100644 --- a/crypto/stack/stack.c +++ b/crypto/stack/stack.c @@ -72,7 +72,7 @@ #undef MIN_NODES #define MIN_NODES 4 -char *STACK_version="Stack part of SSLeay 0.9.1c 22-Dec-1998"; +char *STACK_version="Stack part of SSLeay/OpenSSL 0.9.1c 23-Dec-1998"; #ifndef NOPROTO #define FP_ICC (int (*)(const void *,const void *)) diff --git a/crypto/txt_db/txt_db.c b/crypto/txt_db/txt_db.c index 4e59fa0676..7e82889bf6 100644 --- a/crypto/txt_db/txt_db.c +++ b/crypto/txt_db/txt_db.c @@ -66,7 +66,7 @@ #undef BUFSIZE #define BUFSIZE 512 -char *TXT_DB_version="TXT_DB part of SSLeay 0.9.1c 22-Dec-1998"; +char *TXT_DB_version="TXT_DB part of SSLeay/OpenSSL 0.9.1c 23-Dec-1998"; TXT_DB *TXT_DB_read(in,num) BIO *in; diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c index 1cac610410..ad78cd391f 100644 --- a/crypto/x509/x509_vfy.c +++ b/crypto/x509/x509_vfy.c @@ -80,7 +80,7 @@ static int null_callback(); static int internal_verify(); #endif -char *X509_version="X.509 part of SSLeay 0.9.1c 22-Dec-1998"; +char *X509_version="X.509 part of SSLeay/OpenSSL 0.9.1c 23-Dec-1998"; static STACK *x509_store_ctx_method=NULL; static int x509_store_ctx_num=0; #if 0 diff --git a/ssl/s23_lib.c b/ssl/s23_lib.c index 5019a1a636..ee48cce1d5 100644 --- a/ssl/s23_lib.c +++ b/ssl/s23_lib.c @@ -78,7 +78,7 @@ static int ssl23_put_cipher_by_char(); static SSL_CIPHER *ssl23_get_cipher_by_char(); #endif -char *SSL23_version_str="SSLv2/3 compatibility part of SSLeay 0.9.1c 22-Dec-1998"; +char *SSL23_version_str="SSLv2/3 compatibility part of SSLeay/OpenSSL 0.9.1c 23-Dec-1998"; static SSL_METHOD SSLv23_data= { TLS1_VERSION, diff --git a/ssl/s2_lib.c b/ssl/s2_lib.c index deada3261f..4794df4e5c 100644 --- a/ssl/s2_lib.c +++ b/ssl/s2_lib.c @@ -67,7 +67,7 @@ static long ssl2_default_timeout(void ); static long ssl2_default_timeout(); #endif -char *ssl2_version_str="SSLv2 part of SSLeay 0.9.1c 22-Dec-1998"; +char *ssl2_version_str="SSLv2 part of SSLeay/OpenSSL 0.9.1c 23-Dec-1998"; #define SSL2_NUM_CIPHERS (sizeof(ssl2_ciphers)/sizeof(SSL_CIPHER)) diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index 8bf221a139..79fd4b52a0 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -60,7 +60,7 @@ #include "objects.h" #include "ssl_locl.h" -char *ssl3_version_str="SSLv3 part of SSLeay 0.9.1c 22-Dec-1998"; +char *ssl3_version_str="SSLv3 part of SSLeay/OpenSSL 0.9.1c 23-Dec-1998"; #define SSL3_NUM_CIPHERS (sizeof(ssl3_ciphers)/sizeof(SSL_CIPHER)) diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 093ab052e1..832af9d110 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -61,7 +61,7 @@ #include "lhash.h" #include "ssl_locl.h" -char *SSL_version_str="SSLeay 0.9.1c 22-Dec-1998"; +char *SSL_version_str="SSLeay/OpenSSL 0.9.1c 23-Dec-1998"; static STACK *ssl_meth=NULL; static STACK *ssl_ctx_meth=NULL; diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index 5a22bd62d6..8f40f93ce5 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -60,7 +60,7 @@ #include "objects.h" #include "ssl_locl.h" -char *tls1_version_str="TLSv1 part of SSLeay 0.9.1c 22-Dec-1998"; +char *tls1_version_str="TLSv1 part of SSLeay/OpenSSL 0.9.1c 23-Dec-1998"; #ifndef NO_PROTO static long tls1_default_timeout(void); diff --git a/util/up_ver.pl b/util/up_ver.pl index 5d98fcb8f2..2011545a55 100755 --- a/util/up_ver.pl +++ b/util/up_ver.pl @@ -60,8 +60,8 @@ foreach $file (@files) while () { - if ((s/(SSLeay|OpenSSL) \d\.\d.\d[^"]*(\"|\s)/\1 $ver $time\2/) || - s/^(\#define\s+SSLEAY_VERSION_NUMBER\s+0x)[0-9a-zA-Z]+(.*)$/$1$xver$2/) + if ((s/(SSLeay|OpenSSL|SSLeay\/OpenSSL) \d\.\d.\d[^"]*(\"|\s)/SSLeay\/OpenSSL $ver $time\2/) || + s/^(\#define\s+OPENSSL_VERSION_NUMBER\s+0x)[0-9a-zA-Z]+(.*)$/$1$xver$2/) { print STDERR " Done"; $found++; -- 2.25.1