diff options
| author | Dongsun Lee <ds73.lee@samsung.com> | 2016-09-26 14:27:31 +0900 |
|---|---|---|
| committer | Dongsun Lee <ds73.lee@samsung.com> | 2016-09-26 14:27:31 +0900 |
| commit | a213d701e675e51d5efc03c19e402d174f483f4c (patch) | |
| tree | 90a1ba41072aa91234501613f0ea2d67be89aa27 /apps/s_apps.h | |
| parent | 86af5cfd9400698182796f3c5a2dc6334f1feb9e (diff) | |
| parent | 00fa4cfde370fcd893adae30169ec00d51381581 (diff) | |
| download | openssl-tizen_3.0.tar.gz openssl-tizen_3.0.tar.bz2 openssl-tizen_3.0.zip | |
Merge tag 'upstream/1.0.2i' into tizen_basesubmit/tizen_base/20160926.081001accepted/tizen/base/20161001.020340tizen_3.0
Change-Id: I16b1811518d680619ab815e05e75a8c83bc8d0dc
Signed-off-by: Dongsun Lee <ds73.lee@samsung.com>
Diffstat (limited to 'apps/s_apps.h')
| -rw-r--r-- | apps/s_apps.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/s_apps.h b/apps/s_apps.h index 5b54bfd..5ba1e1d 100644 --- a/apps/s_apps.h +++ b/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, |