diff options
Diffstat (limited to 'apps/s_apps.h')
| -rw-r--r-- | apps/s_apps.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/apps/s_apps.h b/apps/s_apps.h index b0aeeffebf..db8d039178 100644 --- a/apps/s_apps.h +++ b/apps/s_apps.h @@ -178,9 +178,9 @@ int init_client(int *sock, const char *server, int port, int type); int init_client_unix(int *sock, const char *server); #endif int should_retry(int i); -int extract_port(const char *str, short *port_ptr); +int extract_port(const char *str, unsigned short *port_ptr); int extract_host_port(char *str, char **host_ptr, unsigned char *ip, - short *p); + unsigned short *p); long bio_dump_callback(BIO *bio, int cmd, const char *argp, int argi, long argl, long ret); @@ -202,15 +202,12 @@ typedef struct ssl_excert_st SSL_EXCERT; void ssl_ctx_set_excert(SSL_CTX *ctx, SSL_EXCERT *exc); void ssl_excert_free(SSL_EXCERT *exc); -int args_excert(char ***pargs, int *pargc, - int *badarg, BIO *err, SSL_EXCERT **pexc); -int load_excert(SSL_EXCERT **pexc, BIO *err); +int args_excert(int option, SSL_EXCERT **pexc); +int load_excert(SSL_EXCERT **pexc); 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 args_ssl_call(SSL_CTX *ctx, BIO *err, SSL_CONF_CTX *cctx, - STACK_OF(OPENSSL_STRING) *str, int no_ecdhe, int no_jpake); +int config_ctx(SSL_CONF_CTX *cctx, STACK_OF(OPENSSL_STRING) *str, + SSL_CTX *ctx, int no_ecdhe, int no_jpake); int ssl_ctx_add_crls(SSL_CTX *ctx, STACK_OF(X509_CRL) *crls, int crl_download); int ssl_load_stores(SSL_CTX *ctx, const char *vfyCApath, |