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 /apps/apps.h | |
| parent | d0c36288341ca75328eeb4cc33bce6a7d3f65c51 (diff) | |
Update from stable-branch.
Diffstat (limited to 'apps/apps.h')
| -rw-r--r-- | apps/apps.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/apps.h b/apps/apps.h index 62a8659624..4b0a0e1660 100644 --- a/apps/apps.h +++ b/apps/apps.h @@ -308,8 +308,10 @@ int bio_to_mem(unsigned char **out, int maxlen, BIO *in); int pkey_ctrl_string(EVP_PKEY_CTX *ctx, char *value); int init_gen_str(BIO *err, EVP_PKEY_CTX **pctx, const char *algname, ENGINE *e, int do_param); -#ifdef OPENSSL_EXPERIMENTAL_JPAKE +#ifndef OPENSSL_NO_PSK extern char *psk_key; +#endif +#ifndef OPENSSL_NO_JPAKE void jpake_client_auth(BIO *out, BIO *conn, const char *secret); void jpake_server_auth(BIO *out, BIO *conn, const char *secret); #endif |