From 530234b3258a0dce95166b16379e9f368ffdcf41 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sun, 6 Mar 2016 16:54:58 +0100 Subject: [PATCH] curlx.c: use more curl style code --- docs/examples/curlx.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/docs/examples/curlx.c b/docs/examples/curlx.c index 716fb0e19..7a189905c 100644 --- a/docs/examples/curlx.c +++ b/docs/examples/curlx.c @@ -228,8 +228,8 @@ static int ssl_app_verify_callback(X509_STORE_CTX *ctx, void *arg) - an application verification callback (the function above) */ -static CURLcode sslctxfun(CURL * curl, void * sslctx, void * parm) { - +static CURLcode sslctxfun(CURL * curl, void * sslctx, void * parm) +{ sslctxparm * p = (sslctxparm *) parm; SSL_CTX * ctx = (SSL_CTX *) sslctx; @@ -255,12 +255,9 @@ static CURLcode sslctxfun(CURL * curl, void * sslctx, void * parm) { sk_X509_value(p->ca, sk_X509_num(p->ca)-1)); SSL_CTX_set_verify_depth(ctx, 2); - SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, ZERO_NULL); - SSL_CTX_set_cert_verify_callback(ctx, ssl_app_verify_callback, parm); - return CURLE_OK; err: ERR_print_errors(p->errorbio); @@ -268,8 +265,8 @@ static CURLcode sslctxfun(CURL * curl, void * sslctx, void * parm) { } -int main(int argc, char **argv) { - +int main(int argc, char **argv) +{ BIO* in=NULL; BIO* out=NULL; @@ -306,8 +303,6 @@ int main(int argc, char **argv) { OpenSSL_add_all_digests(); ERR_load_crypto_strings(); - - while(*args && *args[0] == '-') { if(!strcmp (*args, "-in")) { if(args[1]) { @@ -384,8 +379,6 @@ int main(int argc, char **argv) { goto err; } - - /* set input */ if((in=BIO_new(BIO_s_file())) == NULL) { @@ -422,8 +415,6 @@ int main(int argc, char **argv) { goto err; } - - if(!(p12bio = BIO_new_file(p.p12file , "rb"))) { BIO_printf(p.errorbio, "Error opening P12 file %s\n", p.p12file); goto err;