diff options
36 files changed, 35 insertions, 170 deletions
diff --git a/lib/libcrypto/aes/aes_misc.c b/lib/libcrypto/aes/aes_misc.c index 343fc33c702..6c1506dd799 100644 --- a/lib/libcrypto/aes/aes_misc.c +++ b/lib/libcrypto/aes/aes_misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aes_misc.c,v 1.9 2014/07/09 09:10:07 miod Exp $ */ +/* $OpenBSD: aes_misc.c,v 1.10 2014/07/09 11:10:50 bcook Exp $ */ /* ==================================================================== * Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved. * @@ -54,8 +54,6 @@ #include <openssl/aes.h> #include "aes_locl.h" -const char AES_version[]="AES" OPENSSL_VERSION_PTEXT; - const char * AES_options(void) { diff --git a/lib/libcrypto/asn1/asn1_lib.c b/lib/libcrypto/asn1/asn1_lib.c index 81ef12b6e71..31e523fc75b 100644 --- a/lib/libcrypto/asn1/asn1_lib.c +++ b/lib/libcrypto/asn1/asn1_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asn1_lib.c,v 1.27 2014/06/12 15:49:27 deraadt Exp $ */ +/* $OpenBSD: asn1_lib.c,v 1.28 2014/07/09 11:10:50 bcook Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -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/lib/libcrypto/bf/bf_ecb.c b/lib/libcrypto/bf/bf_ecb.c index 6d65b16a6a0..305bd78260b 100644 --- a/lib/libcrypto/bf/bf_ecb.c +++ b/lib/libcrypto/bf/bf_ecb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bf_ecb.c,v 1.5 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: bf_ecb.c,v 1.6 2014/07/09 11:10:50 bcook Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -65,8 +65,6 @@ * CAMBRIDGE 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/lib/libcrypto/bn/bn_lib.c b/lib/libcrypto/bn/bn_lib.c index 0de48a45889..49a967e9e0c 100644 --- a/lib/libcrypto/bn/bn_lib.c +++ b/lib/libcrypto/bn/bn_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_lib.c,v 1.28 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: bn_lib.c,v 1.29 2014/07/09 11:10:50 bcook Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -67,8 +67,6 @@ #include "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 /* For a 32 bit machine diff --git a/lib/libcrypto/camellia/cmll_misc.c b/lib/libcrypto/camellia/cmll_misc.c index 16304bab5ce..5caa7a98747 100644 --- a/lib/libcrypto/camellia/cmll_misc.c +++ b/lib/libcrypto/camellia/cmll_misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmll_misc.c,v 1.3 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: cmll_misc.c,v 1.4 2014/07/09 11:10:50 bcook Exp $ */ /* ==================================================================== * Copyright (c) 2006 The OpenSSL Project. All rights reserved. * @@ -54,8 +54,6 @@ #include <openssl/camellia.h> #include "cmll_locl.h" -const char CAMELLIA_version[]="CAMELLIA" OPENSSL_VERSION_PTEXT; - int private_Camellia_set_key(const unsigned char *userKey, const int bits, CAMELLIA_KEY *key) { diff --git a/lib/libcrypto/cast/c_ecb.c b/lib/libcrypto/cast/c_ecb.c index c94c50bd4f8..c3a01b71ae1 100644 --- a/lib/libcrypto/cast/c_ecb.c +++ b/lib/libcrypto/cast/c_ecb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: c_ecb.c,v 1.6 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: c_ecb.c,v 1.7 2014/07/09 11:10:50 bcook Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -60,8 +60,6 @@ #include "cast_lcl.h" #include <openssl/opensslv.h> -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/lib/libcrypto/conf/conf_def.c b/lib/libcrypto/conf/conf_def.c index a5cfd86ae21..f9b4a5b1486 100644 --- a/lib/libcrypto/conf/conf_def.c +++ b/lib/libcrypto/conf/conf_def.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf_def.c,v 1.25 2014/07/08 16:36:45 bcook Exp $ */ +/* $OpenBSD: conf_def.c,v 1.26 2014/07/09 11:10:50 bcook Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -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 = { .name = "OpenSSL default", .create = def_create, diff --git a/lib/libcrypto/conf/conf_lib.c b/lib/libcrypto/conf/conf_lib.c index ae96f2ffbd4..2119eb62198 100644 --- a/lib/libcrypto/conf/conf_lib.c +++ b/lib/libcrypto/conf/conf_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf_lib.c,v 1.11 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: conf_lib.c,v 1.12 2014/07/09 11:10:50 bcook Exp $ */ /* Written by Richard Levitte (richard@levitte.org) for the OpenSSL * project 2000. */ @@ -63,8 +63,6 @@ #include <openssl/conf_api.h> #include <openssl/lhash.h> -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/lib/libcrypto/des/des_ver.h b/lib/libcrypto/des/des_ver.h deleted file mode 100644 index 53e3d82ac5d..00000000000 --- a/lib/libcrypto/des/des_ver.h +++ /dev/null @@ -1,64 +0,0 @@ -/* $OpenBSD: des_ver.h,v 1.9 2014/06/12 15:49:28 deraadt Exp $ */ -/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) - * All rights reserved. - * - * This package is an SSL implementation written - * by Eric Young (eay@cryptsoft.com). - * The implementation was written so as to conform with Netscapes SSL. - * - * This library is free for commercial and non-commercial use as long as - * the following conditions are aheared to. The following conditions - * apply to all code found in this distribution, be it the RC4, RSA, - * lhash, DES, etc., code; not just the SSL code. The SSL documentation - * included with this distribution is covered by the same copyright terms - * except that the holder is Tim Hudson (tjh@cryptsoft.com). - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. - * If this package is used in a product, Eric Young should be given attribution - * as the author of the parts of the library used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * "This product includes cryptographic software written by - * Eric Young (eay@cryptsoft.com)" - * The word 'cryptographic' can be left out if the rouines from the library - * being used are not cryptographic related :-). - * 4. If you include any Windows specific code (or a derivative thereof) from - * the apps directory (application code) you must include an acknowledgement: - * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -/* The following macros make sure the names are different from libdes names */ -#define DES_version OSSL_DES_version -#define libdes_version OSSL_libdes_version - -extern const char OSSL_DES_version[]; /* SSLeay version string */ -extern const char OSSL_libdes_version[]; /* old libdes version string */ diff --git a/lib/libcrypto/des/ecb_enc.c b/lib/libcrypto/des/ecb_enc.c index 808c3b9e1ba..8eaf3e9582f 100644 --- a/lib/libcrypto/des/ecb_enc.c +++ b/lib/libcrypto/des/ecb_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ecb_enc.c,v 1.14 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: ecb_enc.c,v 1.15 2014/07/09 11:10:50 bcook Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,13 +57,9 @@ */ #include "des_locl.h" -#include "des_ver.h" #include <openssl/opensslv.h> #include <openssl/bio.h> -const char libdes_version[]="libdes" OPENSSL_VERSION_PTEXT; -const char DES_version[]="DES" OPENSSL_VERSION_PTEXT; - const char *DES_options(void) { static int init=1; diff --git a/lib/libcrypto/dh/dh_lib.c b/lib/libcrypto/dh/dh_lib.c index 6500d157e98..793a8afdce9 100644 --- a/lib/libcrypto/dh/dh_lib.c +++ b/lib/libcrypto/dh/dh_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dh_lib.c,v 1.15 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: dh_lib.c,v 1.16 2014/07/09 11:10:50 bcook Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -64,8 +64,6 @@ #include <openssl/engine.h> #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/lib/libcrypto/dsa/dsa_lib.c b/lib/libcrypto/dsa/dsa_lib.c index 334d5ba7f2e..19f80687f87 100644 --- a/lib/libcrypto/dsa/dsa_lib.c +++ b/lib/libcrypto/dsa/dsa_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dsa_lib.c,v 1.17 2014/07/09 10:16:24 miod Exp $ */ +/* $OpenBSD: dsa_lib.c,v 1.18 2014/07/09 11:10:50 bcook Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -70,8 +70,6 @@ #include <openssl/dh.h> #endif -const char DSA_version[] = "DSA" OPENSSL_VERSION_PTEXT; - static const DSA_METHOD *default_DSA_method = NULL; void diff --git a/lib/libcrypto/ec/ec_lib.c b/lib/libcrypto/ec/ec_lib.c index 065eaee03e6..f2a4fb8053e 100644 --- a/lib/libcrypto/ec/ec_lib.c +++ b/lib/libcrypto/ec/ec_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_lib.c,v 1.12 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: ec_lib.c,v 1.13 2014/07/09 11:10:50 bcook Exp $ */ /* * Originally written by Bodo Moeller for the OpenSSL project. */ @@ -68,9 +68,6 @@ #include "ec_lcl.h" -static const char EC_version[] = "EC" OPENSSL_VERSION_PTEXT; - - /* functions for EC_GROUP objects */ EC_GROUP * diff --git a/lib/libcrypto/ecdh/ech_lib.c b/lib/libcrypto/ecdh/ech_lib.c index 227448afb13..99390c2373e 100644 --- a/lib/libcrypto/ecdh/ech_lib.c +++ b/lib/libcrypto/ecdh/ech_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ech_lib.c,v 1.5 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: ech_lib.c,v 1.6 2014/07/09 11:10:50 bcook Exp $ */ /* ==================================================================== * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. * @@ -74,8 +74,6 @@ #endif #include <openssl/err.h> -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/lib/libcrypto/ecdsa/ecs_lib.c b/lib/libcrypto/ecdsa/ecs_lib.c index 0293e227972..a1c05d1a414 100644 --- a/lib/libcrypto/ecdsa/ecs_lib.c +++ b/lib/libcrypto/ecdsa/ecs_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ecs_lib.c,v 1.5 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: ecs_lib.c,v 1.6 2014/07/09 11:10:50 bcook Exp $ */ /* ==================================================================== * Copyright (c) 1998-2005 The OpenSSL Project. All rights reserved. * @@ -61,8 +61,6 @@ #include <openssl/err.h> #include <openssl/bn.h> -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/lib/libcrypto/evp/evp_enc.c b/lib/libcrypto/evp/evp_enc.c index 5c3da7c4767..c384a3b2253 100644 --- a/lib/libcrypto/evp/evp_enc.c +++ b/lib/libcrypto/evp/evp_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: evp_enc.c,v 1.20 2014/06/15 15:44:39 jsing Exp $ */ +/* $OpenBSD: evp_enc.c,v 1.21 2014/07/09 11:10:50 bcook Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -68,8 +68,6 @@ #define M_do_cipher(ctx, out, in, inl) ctx->cipher->do_cipher(ctx, out, in, inl) -const char EVP_version[] = "EVP" OPENSSL_VERSION_PTEXT; - void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *ctx) { diff --git a/lib/libcrypto/idea/i_ecb.c b/lib/libcrypto/idea/i_ecb.c index 34c68c6ad80..dac456cdc59 100644 --- a/lib/libcrypto/idea/i_ecb.c +++ b/lib/libcrypto/idea/i_ecb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i_ecb.c,v 1.2 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: i_ecb.c,v 1.3 2014/07/09 11:10:51 bcook Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -60,8 +60,6 @@ #include "idea_lcl.h" #include <openssl/opensslv.h> -const char IDEA_version[]="IDEA" OPENSSL_VERSION_PTEXT; - const char *idea_options(void) { if (sizeof(short) != sizeof(IDEA_INT)) diff --git a/lib/libcrypto/lhash/lhash.c b/lib/libcrypto/lhash/lhash.c index d2c923b0b8c..bfac94a0f72 100644 --- a/lib/libcrypto/lhash/lhash.c +++ b/lib/libcrypto/lhash/lhash.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lhash.c,v 1.15 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: lhash.c,v 1.16 2014/07/09 11:10:51 bcook Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -100,8 +100,6 @@ #include <openssl/crypto.h> #include <openssl/lhash.h> -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/lib/libcrypto/md4/md4_dgst.c b/lib/libcrypto/md4/md4_dgst.c index 74799c5a2f3..d4260c87001 100644 --- a/lib/libcrypto/md4/md4_dgst.c +++ b/lib/libcrypto/md4/md4_dgst.c @@ -1,4 +1,4 @@ -/* $OpenBSD: md4_dgst.c,v 1.11 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: md4_dgst.c,v 1.12 2014/07/09 11:10:51 bcook Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -61,8 +61,6 @@ #include <openssl/crypto.h> #include "md4_locl.h" -const char MD4_version[]="MD4" OPENSSL_VERSION_PTEXT; - /* Implemented from RFC1186 The MD4 Message-Digest Algorithm */ diff --git a/lib/libcrypto/md5/md5_dgst.c b/lib/libcrypto/md5/md5_dgst.c index 62486efb852..6f2a2abceb8 100644 --- a/lib/libcrypto/md5/md5_dgst.c +++ b/lib/libcrypto/md5/md5_dgst.c @@ -1,4 +1,4 @@ -/* $OpenBSD: md5_dgst.c,v 1.12 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: md5_dgst.c,v 1.13 2014/07/09 11:10:51 bcook Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -61,8 +61,6 @@ #include <openssl/opensslv.h> #include <openssl/crypto.h> -const char MD5_version[]="MD5" OPENSSL_VERSION_PTEXT; - /* Implemented from RFC1321 The MD5 Message-Digest Algorithm */ diff --git a/lib/libcrypto/pem/pem_lib.c b/lib/libcrypto/pem/pem_lib.c index 64011b4e68e..8d33fe75a85 100644 --- a/lib/libcrypto/pem/pem_lib.c +++ b/lib/libcrypto/pem/pem_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pem_lib.c,v 1.28 2014/06/12 15:49:30 deraadt Exp $ */ +/* $OpenBSD: pem_lib.c,v 1.29 2014/07/09 11:10:51 bcook Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -74,8 +74,6 @@ #include <openssl/engine.h> #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/lib/libcrypto/rc2/rc2_ecb.c b/lib/libcrypto/rc2/rc2_ecb.c index 72220a2e73d..76873752788 100644 --- a/lib/libcrypto/rc2/rc2_ecb.c +++ b/lib/libcrypto/rc2/rc2_ecb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rc2_ecb.c,v 1.5 2014/06/12 15:49:30 deraadt Exp $ */ +/* $OpenBSD: rc2_ecb.c,v 1.6 2014/07/09 11:10:51 bcook Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -60,8 +60,6 @@ #include "rc2_locl.h" #include <openssl/opensslv.h> -const char RC2_version[]="RC2" OPENSSL_VERSION_PTEXT; - /* RC2 as implemented frm a posting from * Newsgroups: sci.crypt * Sender: pgut01@cs.auckland.ac.nz (Peter Gutmann) diff --git a/lib/libcrypto/rc4/rc4_skey.c b/lib/libcrypto/rc4/rc4_skey.c index 46b7ead36ad..282ed7cc1b5 100644 --- a/lib/libcrypto/rc4/rc4_skey.c +++ b/lib/libcrypto/rc4/rc4_skey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rc4_skey.c,v 1.10 2014/06/12 15:49:30 deraadt Exp $ */ +/* $OpenBSD: rc4_skey.c,v 1.11 2014/07/09 11:10:51 bcook Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -60,8 +60,6 @@ #include "rc4_locl.h" #include <openssl/opensslv.h> -const char RC4_version[]="RC4" OPENSSL_VERSION_PTEXT; - const char *RC4_options(void) { #ifdef RC4_INDEX diff --git a/lib/libcrypto/rc5/rc5_ecb.c b/lib/libcrypto/rc5/rc5_ecb.c index 89d888e2a4a..95d610e79e1 100644 --- a/lib/libcrypto/rc5/rc5_ecb.c +++ b/lib/libcrypto/rc5/rc5_ecb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rc5_ecb.c,v 1.2 2014/06/12 15:49:30 deraadt Exp $ */ +/* $OpenBSD: rc5_ecb.c,v 1.3 2014/07/09 11:10:51 bcook Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -60,8 +60,6 @@ #include "rc5_locl.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, RC5_32_KEY *ks, int encrypt) { diff --git a/lib/libcrypto/ripemd/rmd_dgst.c b/lib/libcrypto/ripemd/rmd_dgst.c index 44351c20abd..1d2498daec4 100644 --- a/lib/libcrypto/ripemd/rmd_dgst.c +++ b/lib/libcrypto/ripemd/rmd_dgst.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rmd_dgst.c,v 1.14 2014/06/12 15:49:30 deraadt Exp $ */ +/* $OpenBSD: rmd_dgst.c,v 1.15 2014/07/09 11:10:51 bcook Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -61,8 +61,6 @@ #include <openssl/opensslv.h> #include <openssl/crypto.h> -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/lib/libcrypto/rsa/rsa_lib.c b/lib/libcrypto/rsa/rsa_lib.c index 62d415a27be..44a86700c2c 100644 --- a/lib/libcrypto/rsa/rsa_lib.c +++ b/lib/libcrypto/rsa/rsa_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_lib.c,v 1.23 2014/07/09 08:55:32 miod Exp $ */ +/* $OpenBSD: rsa_lib.c,v 1.24 2014/07/09 11:10:51 bcook Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -67,8 +67,6 @@ #include <openssl/engine.h> #endif -const char RSA_version[] = "RSA" OPENSSL_VERSION_PTEXT; - static const RSA_METHOD *default_RSA_meth = NULL; RSA * diff --git a/lib/libcrypto/sha/sha1dgst.c b/lib/libcrypto/sha/sha1dgst.c index 08c20ec8062..94fabddd835 100644 --- a/lib/libcrypto/sha/sha1dgst.c +++ b/lib/libcrypto/sha/sha1dgst.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sha1dgst.c,v 1.11 2014/06/12 15:49:30 deraadt Exp $ */ +/* $OpenBSD: sha1dgst.c,v 1.12 2014/07/09 11:10:51 bcook Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -65,8 +65,6 @@ #include <openssl/opensslv.h> -const char SHA1_version[]="SHA1" OPENSSL_VERSION_PTEXT; - /* The implementation is in ../md32_common.h */ #include "sha_locl.h" diff --git a/lib/libcrypto/sha/sha256.c b/lib/libcrypto/sha/sha256.c index f008724c0e4..b623893be40 100644 --- a/lib/libcrypto/sha/sha256.c +++ b/lib/libcrypto/sha/sha256.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sha256.c,v 1.4 2014/06/12 15:49:30 deraadt Exp $ */ +/* $OpenBSD: sha256.c,v 1.5 2014/07/09 11:10:51 bcook Exp $ */ /* ==================================================================== * Copyright (c) 2004 The OpenSSL Project. All rights reserved * according to the OpenSSL license [found in ../../LICENSE]. @@ -15,8 +15,6 @@ #include <openssl/sha.h> #include <openssl/opensslv.h> -const char SHA256_version[]="SHA-256" OPENSSL_VERSION_PTEXT; - int SHA224_Init(SHA256_CTX *c) { memset (c,0,sizeof(*c)); diff --git a/lib/libcrypto/sha/sha512.c b/lib/libcrypto/sha/sha512.c index 5bc679680bc..08b15643633 100644 --- a/lib/libcrypto/sha/sha512.c +++ b/lib/libcrypto/sha/sha512.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sha512.c,v 1.9 2014/06/12 15:49:30 deraadt Exp $ */ +/* $OpenBSD: sha512.c,v 1.10 2014/07/09 11:10:51 bcook Exp $ */ /* ==================================================================== * Copyright (c) 2004 The OpenSSL Project. All rights reserved * according to the OpenSSL license [found in ../../LICENSE]. @@ -51,8 +51,6 @@ #include "cryptlib.h" -const char SHA512_version[]="SHA-512" OPENSSL_VERSION_PTEXT; - #if !defined(__STRICT_ALIGNMENT) || defined(SHA512_ASM) #define SHA512_BLOCK_CAN_MANAGE_UNALIGNED_DATA #endif diff --git a/lib/libcrypto/sha/sha_dgst.c b/lib/libcrypto/sha/sha_dgst.c index 5a88d2573d7..a2554509772 100644 --- a/lib/libcrypto/sha/sha_dgst.c +++ b/lib/libcrypto/sha/sha_dgst.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sha_dgst.c,v 1.10 2014/06/12 15:49:30 deraadt Exp $ */ +/* $OpenBSD: sha_dgst.c,v 1.11 2014/07/09 11:10:51 bcook Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -65,8 +65,6 @@ #include <openssl/opensslv.h> -const char SHA_version[]="SHA" OPENSSL_VERSION_PTEXT; - /* The implementation is in ../md32_common.h */ #include "sha_locl.h" diff --git a/lib/libcrypto/stack/stack.c b/lib/libcrypto/stack/stack.c index 8132e0212d7..5e3ab19cd3c 100644 --- a/lib/libcrypto/stack/stack.c +++ b/lib/libcrypto/stack/stack.c @@ -1,4 +1,4 @@ -/* $OpenBSD: stack.c,v 1.15 2014/06/12 15:49:30 deraadt Exp $ */ +/* $OpenBSD: stack.c,v 1.16 2014/07/09 11:10:51 bcook Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -73,8 +73,6 @@ #undef MIN_NODES #define MIN_NODES 4 -const char STACK_version[]="Stack" OPENSSL_VERSION_PTEXT; - #include <errno.h> int diff --git a/lib/libcrypto/txt_db/txt_db.c b/lib/libcrypto/txt_db/txt_db.c index e8624a149cd..274be5f4dc9 100644 --- a/lib/libcrypto/txt_db/txt_db.c +++ b/lib/libcrypto/txt_db/txt_db.c @@ -1,4 +1,4 @@ -/* $OpenBSD: txt_db.c,v 1.16 2014/06/12 15:49:31 deraadt Exp $ */ +/* $OpenBSD: txt_db.c,v 1.17 2014/07/09 11:10:51 bcook Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -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) { diff --git a/lib/libcrypto/x509/x509_vfy.c b/lib/libcrypto/x509/x509_vfy.c index b82af081c62..17713787468 100644 --- a/lib/libcrypto/x509/x509_vfy.c +++ b/lib/libcrypto/x509/x509_vfy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_vfy.c,v 1.29 2014/06/20 20:59:49 deraadt Exp $ */ +/* $OpenBSD: x509_vfy.c,v 1.30 2014/07/09 11:10:51 bcook Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -133,8 +133,6 @@ static int check_crl_chain(X509_STORE_CTX *ctx, STACK_OF(X509) *cert_path, 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/lib/libssl/d1_lib.c b/lib/libssl/d1_lib.c index b90cc8eed3a..10f55554e01 100644 --- a/lib/libssl/d1_lib.c +++ b/lib/libssl/d1_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: d1_lib.c,v 1.21 2014/06/21 17:02:25 jsing Exp $ */ +/* $OpenBSD: d1_lib.c,v 1.22 2014/07/09 11:10:51 bcook Exp $ */ /* * DTLS implementation written by Nagendra Modadugu * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. @@ -68,7 +68,6 @@ #include "pqueue.h" #include "ssl_locl.h" -const char dtls1_version_str[]="DTLSv1" OPENSSL_VERSION_PTEXT; int dtls1_listen(SSL *s, struct sockaddr *client); SSL3_ENC_METHOD DTLSv1_enc_data = { diff --git a/lib/libssl/s3_lib.c b/lib/libssl/s3_lib.c index f98094181de..d07d7e7cbc5 100644 --- a/lib/libssl/s3_lib.c +++ b/lib/libssl/s3_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_lib.c,v 1.65 2014/07/08 22:09:01 jsing Exp $ */ +/* $OpenBSD: s3_lib.c,v 1.66 2014/07/09 11:10:51 bcook Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -155,8 +155,6 @@ #include <openssl/md5.h> #include <openssl/dh.h> -const char ssl3_version_str[]="SSLv3" OPENSSL_VERSION_PTEXT; - #define SSL3_NUM_CIPHERS (sizeof(ssl3_ciphers) / sizeof(SSL_CIPHER)) /* diff --git a/lib/libssl/t1_lib.c b/lib/libssl/t1_lib.c index 7b3393820bc..03af6e29efa 100644 --- a/lib/libssl/t1_lib.c +++ b/lib/libssl/t1_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: t1_lib.c,v 1.48 2014/06/19 21:29:51 tedu Exp $ */ +/* $OpenBSD: t1_lib.c,v 1.49 2014/07/09 11:10:51 bcook Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -117,8 +117,6 @@ #include <openssl/rand.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, const unsigned char *sess_id, int sesslen, SSL_SESSION **psess); |