summaryrefslogtreecommitdiffstats
path: root/crypto/openssl/apps/s_apps.h
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2016-09-22 15:55:27 +0000
committerjkim <jkim@FreeBSD.org>2016-09-22 15:55:27 +0000
commit3599587ae793583e28ee9f173cd8fd9a871306f3 (patch)
treec5dc8fe4f348f5db5683bbe8d4f3413a7440b924 /crypto/openssl/apps/s_apps.h
parent73e9e3e293d8e68ffafc5d04f0cc74a824c84185 (diff)
downloadFreeBSD-src-3599587ae793583e28ee9f173cd8fd9a871306f3.zip
FreeBSD-src-3599587ae793583e28ee9f173cd8fd9a871306f3.tar.gz
MFS: r306195
Merge OpenSSL 1.0.2i. Approved by: re (gjb, implicit), so (delphij)
Diffstat (limited to 'crypto/openssl/apps/s_apps.h')
-rw-r--r--crypto/openssl/apps/s_apps.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/openssl/apps/s_apps.h b/crypto/openssl/apps/s_apps.h
index 5b54bfd..5ba1e1d 100644
--- a/crypto/openssl/apps/s_apps.h
+++ b/crypto/openssl/apps/s_apps.h
@@ -199,7 +199,8 @@ int load_excert(SSL_EXCERT **pexc, BIO *err);
void print_ssl_summary(BIO *bio, SSL *s);
#ifdef HEADER_SSL_H
int args_ssl(char ***pargs, int *pargc, SSL_CONF_CTX *cctx,
- int *badarg, BIO *err, STACK_OF(OPENSSL_STRING) **pstr);
+ int *badarg, BIO *err, STACK_OF(OPENSSL_STRING) **pstr,
+ int *no_prot_opt);
int args_ssl_call(SSL_CTX *ctx, BIO *err, SSL_CONF_CTX *cctx,
STACK_OF(OPENSSL_STRING) *str, int no_ecdhe, int no_jpake);
int ssl_ctx_add_crls(SSL_CTX *ctx, STACK_OF(X509_CRL) *crls,
OpenPOWER on IntegriCloud