summaryrefslogtreecommitdiffstats
path: root/crypto/err
diff options
context:
space:
mode:
authorRich Salz <rsalz@akamai.com>2016-02-14 00:17:59 -0500
committerRich Salz <rsalz@openssl.org>2016-02-17 09:46:10 -0500
commitdba317774555fbd5bccdfc5270fc486e0d02d9db (patch)
treee2665b0bb6f2ee46fbaa34f048c7e349ca1f8ce7 /crypto/err
parent6a78ae2821e89a8838714496524fd39d9d21fb1b (diff)
Remove JPAKE
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Diffstat (limited to 'crypto/err')
-rw-r--r--crypto/err/err_all.c6
-rw-r--r--crypto/err/openssl.ec1
2 files changed, 0 insertions, 7 deletions
diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c
index ffb1b834c7..4932587c9f 100644
--- a/crypto/err/err_all.c
+++ b/crypto/err/err_all.c
@@ -98,9 +98,6 @@
#ifndef OPENSSL_NO_CMS
# include <openssl/cms.h>
#endif
-#ifndef OPENSSL_NO_JPAKE
-# include <openssl/jpake.h>
-#endif
#include <internal/ct_int.h>
#include <openssl/async.h>
@@ -154,9 +151,6 @@ void err_load_crypto_strings_intern(void)
# ifndef OPENSSL_NO_CMS
ERR_load_CMS_strings();
# endif
-# ifndef OPENSSL_NO_JPAKE
- ERR_load_JPAKE_strings();
-# endif
# ifndef OPENSSL_NO_CT
ERR_load_CT_strings();
# endif
diff --git a/crypto/err/openssl.ec b/crypto/err/openssl.ec
index 1c6e96d977..88d7be50a9 100644
--- a/crypto/err/openssl.ec
+++ b/crypto/err/openssl.ec
@@ -32,7 +32,6 @@ L STORE include/openssl/store.h crypto/store/str_err.c
L TS include/openssl/ts.h crypto/ts/ts_err.c
L HMAC include/openssl/hmac.h crypto/hmac/hmac_err.c
L CMS include/openssl/cms.h crypto/cms/cms_err.c
-L JPAKE include/openssl/jpake.h crypto/jpake/jpake_err.c
L FIPS include/openssl/fips.h crypto/fips_err.h
L ASYNC include/openssl/async.h crypto/async/async_err.c