diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2014-07-11 08:00:26 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2014-07-11 08:00:26 +0000 |
| commit | f9bd55dc042bf04d897f47574f231f6850a054af (patch) | |
| tree | 5f10d6c3479b9048ff1d817a6da24c3ce0fb5a0d /lib | |
| parent | d7e6db4591edd93520191987bd7289eb6be74eea (diff) | |
Remove JPAKE remnants - there is no jpake.h, so if OPENSSL_NO_JPAKE was
removed from opensslconf.h, this would no longer compile.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libssl/src/crypto/err/err_all.c | 8 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/err/openssl.ec | 1 |
2 files changed, 1 insertions, 8 deletions
diff --git a/lib/libssl/src/crypto/err/err_all.c b/lib/libssl/src/crypto/err/err_all.c index d950aad3b4b..64598d6cf4b 100644 --- a/lib/libssl/src/crypto/err/err_all.c +++ b/lib/libssl/src/crypto/err/err_all.c @@ -1,4 +1,4 @@ -/* $OpenBSD: err_all.c,v 1.16 2014/07/10 22:45:57 jsing Exp $ */ +/* $OpenBSD: err_all.c,v 1.17 2014/07/11 08:00:25 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -104,9 +104,6 @@ #ifndef OPENSSL_NO_CMS #include <openssl/cms.h> #endif -#ifndef OPENSSL_NO_JPAKE -#include <openssl/jpake.h> -#endif void ERR_load_crypto_strings(void) @@ -159,8 +156,5 @@ ERR_load_crypto_strings(void) #ifndef OPENSSL_NO_CMS ERR_load_CMS_strings(); #endif -#ifndef OPENSSL_NO_JPAKE - ERR_load_JPAKE_strings(); -#endif #endif } diff --git a/lib/libssl/src/crypto/err/openssl.ec b/lib/libssl/src/crypto/err/openssl.ec index e0554b4342e..c513734e94e 100644 --- a/lib/libssl/src/crypto/err/openssl.ec +++ b/lib/libssl/src/crypto/err/openssl.ec @@ -34,7 +34,6 @@ L STORE crypto/store/store.h crypto/store/str_err.c L TS crypto/ts/ts.h crypto/ts/ts_err.c L HMAC crypto/hmac/hmac.h crypto/hmac/hmac_err.c L CMS crypto/cms/cms.h crypto/cms/cms_err.c -L JPAKE crypto/jpake/jpake.h crypto/jpake/jpake_err.c # additional header files to be scanned for function names L NONE crypto/x509/x509_vfy.h NONE |