generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

curlx.c: use more curl style code

Browse Source
This commit is contained in:
Daniel Stenberg 2016-03-06 16:54:58 +01:00
parent e6293cf876
commit 530234b325
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
docs/examples/curlx.c
View File

@ -228,8 +228,8 @@ static int ssl_app_verify_callback(X509_STORE_CTX *ctx, void *arg)
- an application verification callback (the function above) - 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; sslctxparm * p = (sslctxparm *) parm;
SSL_CTX * ctx = (SSL_CTX *) sslctx; 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)); sk_X509_value(p->ca, sk_X509_num(p->ca)-1));
SSL_CTX_set_verify_depth(ctx, 2); SSL_CTX_set_verify_depth(ctx, 2);
SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, ZERO_NULL); SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, ZERO_NULL);
SSL_CTX_set_cert_verify_callback(ctx, ssl_app_verify_callback, parm); SSL_CTX_set_cert_verify_callback(ctx, ssl_app_verify_callback, parm);
return CURLE_OK; return CURLE_OK;
err: err:
ERR_print_errors(p->errorbio); 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* in=NULL;
BIO* out=NULL; BIO* out=NULL;
@ -306,8 +303,6 @@ int main(int argc, char **argv) {
OpenSSL_add_all_digests(); OpenSSL_add_all_digests();
ERR_load_crypto_strings(); ERR_load_crypto_strings();
while(*args && *args[0] == '-') { while(*args && *args[0] == '-') {
if(!strcmp (*args, "-in")) { if(!strcmp (*args, "-in")) {
if(args[1]) { if(args[1]) {
@ -384,8 +379,6 @@ int main(int argc, char **argv) {
goto err; goto err;
} }
/* set input */ /* set input */
if((in=BIO_new(BIO_s_file())) == NULL) { if((in=BIO_new(BIO_s_file())) == NULL) {
@ -422,8 +415,6 @@ int main(int argc, char **argv) {
goto err; goto err;
} }
if(!(p12bio = BIO_new_file(p.p12file , "rb"))) { if(!(p12bio = BIO_new_file(p.p12file , "rb"))) {
BIO_printf(p.errorbio, "Error opening P12 file %s\n", p.p12file); BIO_printf(p.errorbio, "Error opening P12 file %s\n", p.p12file);
goto err; goto err;