summaryrefslogtreecommitdiffstats
path: root/crypto/err
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2008-11-12 16:54:35 +0000
committerDr. Stephen Henson <steve@openssl.org>2008-11-12 16:54:35 +0000
commit81dde5e8fe0421169e26d5221c8f245e016c652b (patch)
tree56faaec988b3bb60ac97289afce5be32a7cf0575 /crypto/err
parentb84e44186131ec32cc69e6ba7f6c391ef3e6a507 (diff)
Add support for experimental code, not compiled in by default and
with OPENSSL_EXPERIMENTAL_FOO around it. Make JPAKE experimental.
Diffstat (limited to 'crypto/err')
-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 4ca08ac2b5..1e71719f1d 100644
--- a/crypto/err/err_all.c
+++ b/crypto/err/err_all.c
@@ -101,8 +101,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)
{
@@ -153,6 +154,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
}