Update from 1.0.0-stable.

[openssl.git] / apps / apps.h

diff --git a/apps/apps.h b/apps/apps.h
index 55e3f26213121ebd9cefe5b65039cbe99361eaad..4b0a0e16607bb12622b052736a3b5edf686da6d1 100644 (file)
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -294,7 +294,10 @@ int index_index(CA_DB *db);
 int save_index(const char *dbfile, const char *suffix, CA_DB *db);
 int rotate_index(const char *dbfile, const char *new_suffix, const char *old_suffix);
 void free_index(CA_DB *db);
-int index_name_cmp(const STRING *a, const STRING *b);
+#define index_name_cmp_noconst(a, b) \
+       index_name_cmp((const CSTRING *)CHECKED_PTR_OF(STRING, a), \
+       (const CSTRING *)CHECKED_PTR_OF(STRING, b))
+int index_name_cmp(const CSTRING *a, const CSTRING *b);
 int parse_yesno(const char *str, int def);
 
 X509_NAME *parse_name(char *str, long chtype, int multirdn);
@@ -305,6 +308,13 @@ 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);
+#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
 
 #define FORMAT_UNDEF    0
 #define FORMAT_ASN1     1