summaryrefslogtreecommitdiff
path: root/crypto/err/err_all.c
diff options
context:
space:
mode:
authorsteve <steve>2008-11-12 17:28:15 +0000
committersteve <steve>2008-11-12 17:28:15 +0000
commita7631ae82dc424a9ac2535be68f1c3120428ac71 (patch)
tree77c5bd0ac0f84b9833774d0f6dc0f10d471a04e1 /crypto/err/err_all.c
parentc87e64dfd40e1fe083a84c664bcde1903af016a4 (diff)
downloadopenssl-a7631ae82dc424a9ac2535be68f1c3120428ac71.tar.gz
Update from stable branch.
Diffstat (limited to 'crypto/err/err_all.c')
-rw-r--r--crypto/err/err_all.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c
index 5ab89f949..06e137e28 100644
--- a/crypto/err/err_all.c
+++ b/crypto/err/err_all.c
@@ -99,8 +99,9 @@
#ifndef OPENSSL_NO_CMS
#include <openssl/cms.h>
#endif
-
+#ifdef OPENSSL_EXPERIMENTAL_JPAKE
#include <openssl/jpake.h>
+#endif
void ERR_load_crypto_strings(void)
{
@@ -150,6 +151,8 @@ void ERR_load_crypto_strings(void)
#ifndef OPENSSL_NO_CMS
ERR_load_CMS_strings();
#endif
+#ifdef OPENSSL_EXPERIMENTAL_JPAKE
ERR_load_JPAKE_strings();
#endif
+#endif
}