diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2008-11-24 17:27:08 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2008-11-24 17:27:08 +0000 |
| commit | 79bd20fd1755d0d8a6d1d758b2f8858643621923 (patch) | |
| tree | 06725a9fe6fee39c9d637a410dab64043d16b862 /crypto | |
| parent | d0c36288341ca75328eeb4cc33bce6a7d3f65c51 (diff) | |
| download | openssl-79bd20fd1755d0d8a6d1d758b2f8858643621923.tar.gz | |
Update from stable-branch.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/err/err_all.c | 4 | ||||
| -rw-r--r-- | crypto/jpake/jpake.h | 4 | ||||
| -rw-r--r-- | crypto/jpake/jpaketest.c | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c index 06e137e28e..8cc9b806e0 100644 --- a/crypto/err/err_all.c +++ b/crypto/err/err_all.c @@ -99,7 +99,7 @@ #ifndef OPENSSL_NO_CMS #include <openssl/cms.h> #endif -#ifdef OPENSSL_EXPERIMENTAL_JPAKE +#ifndef OPENSSL_NO_JPAKE #include <openssl/jpake.h> #endif @@ -151,7 +151,7 @@ void ERR_load_crypto_strings(void) #ifndef OPENSSL_NO_CMS ERR_load_CMS_strings(); #endif -#ifdef OPENSSL_EXPERIMENTAL_JPAKE +#ifndef OPENSSL_NO_JPAKE ERR_load_JPAKE_strings(); #endif #endif diff --git a/crypto/jpake/jpake.h b/crypto/jpake/jpake.h index 8beb9a5b30..693ea188cb 100644 --- a/crypto/jpake/jpake.h +++ b/crypto/jpake/jpake.h @@ -10,6 +10,10 @@ #include <openssl/opensslconf.h> +#ifdef OPENSSL_NO_JPAKE +#error JPAKE is disabled. +#endif + #ifdef __cplusplus extern "C" { #endif diff --git a/crypto/jpake/jpaketest.c b/crypto/jpake/jpaketest.c index 6bf7ee46d9..008756fc95 100644 --- a/crypto/jpake/jpaketest.c +++ b/crypto/jpake/jpaketest.c @@ -1,4 +1,6 @@ -#ifndef OPENSSL_EXPERIMENTAL_JPAKE + +#include <openssl/opensslconf.h> +#ifdef OPENSSL_NO_JPAKE #include <stdio.h> |