diff options
Diffstat (limited to 'src/lib/libssl/src/apps/apps.h')
-rw-r--r-- | src/lib/libssl/src/apps/apps.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/lib/libssl/src/apps/apps.h b/src/lib/libssl/src/apps/apps.h index 596a39aceb..c1ca99da12 100644 --- a/src/lib/libssl/src/apps/apps.h +++ b/src/lib/libssl/src/apps/apps.h | |||
@@ -317,6 +317,12 @@ int bio_to_mem(unsigned char **out, int maxlen, BIO *in); | |||
317 | int pkey_ctrl_string(EVP_PKEY_CTX *ctx, char *value); | 317 | int pkey_ctrl_string(EVP_PKEY_CTX *ctx, char *value); |
318 | int init_gen_str(BIO *err, EVP_PKEY_CTX **pctx, | 318 | int init_gen_str(BIO *err, EVP_PKEY_CTX **pctx, |
319 | const char *algname, ENGINE *e, int do_param); | 319 | const char *algname, ENGINE *e, int do_param); |
320 | int do_X509_sign(BIO *err, X509 *x, EVP_PKEY *pkey, const EVP_MD *md, | ||
321 | STACK_OF(OPENSSL_STRING) *sigopts); | ||
322 | int do_X509_REQ_sign(BIO *err, X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md, | ||
323 | STACK_OF(OPENSSL_STRING) *sigopts); | ||
324 | int do_X509_CRL_sign(BIO *err, X509_CRL *x, EVP_PKEY *pkey, const EVP_MD *md, | ||
325 | STACK_OF(OPENSSL_STRING) *sigopts); | ||
320 | #ifndef OPENSSL_NO_PSK | 326 | #ifndef OPENSSL_NO_PSK |
321 | extern char *psk_key; | 327 | extern char *psk_key; |
322 | #endif | 328 | #endif |
@@ -325,6 +331,10 @@ void jpake_client_auth(BIO *out, BIO *conn, const char *secret); | |||
325 | void jpake_server_auth(BIO *out, BIO *conn, const char *secret); | 331 | void jpake_server_auth(BIO *out, BIO *conn, const char *secret); |
326 | #endif | 332 | #endif |
327 | 333 | ||
334 | #if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG) | ||
335 | unsigned char *next_protos_parse(unsigned short *outlen, const char *in); | ||
336 | #endif /* !OPENSSL_NO_TLSEXT && !OPENSSL_NO_NEXTPROTONEG */ | ||
337 | |||
328 | #define FORMAT_UNDEF 0 | 338 | #define FORMAT_UNDEF 0 |
329 | #define FORMAT_ASN1 1 | 339 | #define FORMAT_ASN1 1 |
330 | #define FORMAT_TEXT 2 | 340 | #define FORMAT_TEXT 2 |
@@ -357,4 +367,7 @@ int raw_write_stdout(const void *,int); | |||
357 | #define TM_START 0 | 367 | #define TM_START 0 |
358 | #define TM_STOP 1 | 368 | #define TM_STOP 1 |
359 | double app_tminterval (int stop,int usertime); | 369 | double app_tminterval (int stop,int usertime); |
370 | |||
371 | #define OPENSSL_NO_SSL_INTERN | ||
372 | |||
360 | #endif | 373 | #endif |