diff options
| author | bcook <> | 2014-07-09 11:10:51 +0000 |
|---|---|---|
| committer | bcook <> | 2014-07-09 11:10:51 +0000 |
| commit | 0563b5d49da5a96960925938b3e4f3152e6f5c92 (patch) | |
| tree | d5dcd125a1cd3379f5a9e75a01457548117ec1a6 /src/lib/libcrypto/conf | |
| parent | dcbbcd5e23d32dde13dc88631bb224cb81a153da (diff) | |
| download | openbsd-0563b5d49da5a96960925938b3e4f3152e6f5c92.tar.gz openbsd-0563b5d49da5a96960925938b3e4f3152e6f5c92.tar.bz2 openbsd-0563b5d49da5a96960925938b3e4f3152e6f5c92.zip | |
remove unused, private version strings except SSL_version_str
Also remove unused des_ver.h, which exports some of these strings, but is not installed.
ok miod@ tedu@
Diffstat (limited to 'src/lib/libcrypto/conf')
| -rw-r--r-- | src/lib/libcrypto/conf/conf_def.c | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/conf/conf_lib.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/lib/libcrypto/conf/conf_def.c b/src/lib/libcrypto/conf/conf_def.c index a5cfd86ae2..f9b4a5b148 100644 --- a/src/lib/libcrypto/conf/conf_def.c +++ b/src/lib/libcrypto/conf/conf_def.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: conf_def.c,v 1.25 2014/07/08 16:36:45 bcook Exp $ */ | 1 | /* $OpenBSD: conf_def.c,v 1.26 2014/07/09 11:10:50 bcook Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -88,8 +88,6 @@ static int def_dump(const CONF *conf, BIO *bp); | |||
| 88 | static int def_is_number(const CONF *conf, char c); | 88 | static int def_is_number(const CONF *conf, char c); |
| 89 | static int def_to_int(const CONF *conf, char c); | 89 | static int def_to_int(const CONF *conf, char c); |
| 90 | 90 | ||
| 91 | const char CONF_def_version[]="CONF_def" OPENSSL_VERSION_PTEXT; | ||
| 92 | |||
| 93 | static CONF_METHOD default_method = { | 91 | static CONF_METHOD default_method = { |
| 94 | .name = "OpenSSL default", | 92 | .name = "OpenSSL default", |
| 95 | .create = def_create, | 93 | .create = def_create, |
diff --git a/src/lib/libcrypto/conf/conf_lib.c b/src/lib/libcrypto/conf/conf_lib.c index ae96f2ffbd..2119eb6219 100644 --- a/src/lib/libcrypto/conf/conf_lib.c +++ b/src/lib/libcrypto/conf/conf_lib.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: conf_lib.c,v 1.11 2014/06/12 15:49:28 deraadt Exp $ */ | 1 | /* $OpenBSD: conf_lib.c,v 1.12 2014/07/09 11:10:50 bcook Exp $ */ |
| 2 | /* Written by Richard Levitte (richard@levitte.org) for the OpenSSL | 2 | /* Written by Richard Levitte (richard@levitte.org) for the OpenSSL |
| 3 | * project 2000. | 3 | * project 2000. |
| 4 | */ | 4 | */ |
| @@ -63,8 +63,6 @@ | |||
| 63 | #include <openssl/conf_api.h> | 63 | #include <openssl/conf_api.h> |
| 64 | #include <openssl/lhash.h> | 64 | #include <openssl/lhash.h> |
| 65 | 65 | ||
| 66 | const char CONF_version[]="CONF" OPENSSL_VERSION_PTEXT; | ||
| 67 | |||
| 68 | static CONF_METHOD *default_CONF_method = NULL; | 66 | static CONF_METHOD *default_CONF_method = NULL; |
| 69 | 67 | ||
| 70 | /* Init a 'CONF' structure from an old LHASH */ | 68 | /* Init a 'CONF' structure from an old LHASH */ |
