diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2008-11-12 17:28:18 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2008-11-12 17:28:18 +0000 |
| commit | ed551cddf7130a43d992f386e26071e9ee6f105a (patch) | |
| tree | 58cb5d24e5cfd04d97d5c4efa7344097a8cefb5a /crypto | |
| parent | 5aca224ecd7fcbcb39b3e302106708cd2f6f0fb9 (diff) | |
Update from stable branch.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/err/err_all.c | 5 | ||||
| -rw-r--r-- | crypto/jpake/jpake.h | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c index 5ab89f9498..06e137e28e 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 } diff --git a/crypto/jpake/jpake.h b/crypto/jpake/jpake.h index becc66c334..a39a9a877f 100644 --- a/crypto/jpake/jpake.h +++ b/crypto/jpake/jpake.h @@ -8,6 +8,12 @@ #ifndef HEADER_JPAKE_H #define HEADER_JPAKE_H +#include <openssl/opensslconf.h> + +#ifndef OPENSSL_EXPERIMENTAL_JPAKE +#error JPAKE is disabled. +#endif + #ifdef __cplusplus extern "C" { #endif |