From e3498cc30de01b4b8f5360eb31a18369107bbe2f Mon Sep 17 00:00:00 2001 From: erdgeist Date: Wed, 16 Apr 2014 20:13:40 +0200 Subject: Fix trailing spaces --- vchat-ssl.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/vchat-ssl.c b/vchat-ssl.c index 79092a6..1a88b6c 100755 --- a/vchat-ssl.c +++ b/vchat-ssl.c @@ -103,17 +103,17 @@ SSL_CTX * vc_create_sslctx( vc_x509store_t *vc_store ) if(vc_store->use_certfile) SSL_CTX_use_certificate_chain_file(ctx, vc_store->use_certfile); else { - SSL_CTX_use_certificate(ctx, + SSL_CTX_use_certificate(ctx, sk_X509_value(vc_store->use_certs, 0)); for(i=0,n=sk_X509_num(vc_store->use_certs); iuse_certs, i)); } SSL_CTX_set_default_passwd_cb(ctx, vc_store->askpass_callback); if(vc_store->use_keyfile) { - r=SSL_CTX_use_PrivateKey_file(ctx, vc_store->use_keyfile, + r=SSL_CTX_use_PrivateKey_file(ctx, vc_store->use_keyfile, SSL_FILETYPE_PEM); } else if(vc_store->use_key) r=SSL_CTX_use_PrivateKey(ctx, vc_store->use_key); @@ -263,16 +263,16 @@ X509_STORE *vc_x509store_create(vc_x509store_t *vc_store) if(!vc_store->cafile) { if( !(vc_store->flags & VC_X509S_NODEF_CAFILE) ) X509_LOOKUP_load_file(lookup, 0, X509_FILETYPE_DEFAULT); - } else if( !X509_LOOKUP_load_file(lookup, vc_store->cafile, + } else if( !X509_LOOKUP_load_file(lookup, vc_store->cafile, X509_FILETYPE_PEM) ) VC_STORE_ERR_EXIT(store); if(vc_store->crlfile) { - if( !X509_load_crl_file(lookup, vc_store->crlfile, + if( !X509_load_crl_file(lookup, vc_store->crlfile, X509_FILETYPE_PEM) ) VC_STORE_ERR_EXIT(store); - X509_STORE_set_flags( store, + X509_STORE_set_flags( store, X509_V_FLAG_CRL_CHECK | X509_V_FLAG_CRL_CHECK_ALL ); } @@ -282,7 +282,7 @@ X509_STORE *vc_x509store_create(vc_x509store_t *vc_store) if( !vc_store->capath ) { if( !(vc_store->flags & VC_X509S_NODEF_CAPATH) ) X509_LOOKUP_add_dir(lookup, 0, X509_FILETYPE_DEFAULT); - } else if( !X509_LOOKUP_add_dir(lookup, vc_store->capath, + } else if( !X509_LOOKUP_add_dir(lookup, vc_store->capath, X509_FILETYPE_PEM) ) VC_STORE_ERR_EXIT(store); @@ -291,8 +291,8 @@ X509_STORE *vc_x509store_create(vc_x509store_t *vc_store) VC_STORE_ERR_EXIT(store); for( i=0, n=sk_X509_CRL_num(vc_store->crls); icrls, i)) ) + if( !X509_STORE_add_crl(store, + sk_X509_CRL_value(vc_store->crls, i)) ) VC_STORE_ERR_EXIT(store); return(store); @@ -301,7 +301,7 @@ X509_STORE *vc_x509store_create(vc_x509store_t *vc_store) int vc_verify_callback(int ok, X509_STORE_CTX *store) { if(!ok) { - snprintf(tmpstr, TMPSTRSIZE, "[SSL VERIFY ERROR ] %s", + snprintf(tmpstr, TMPSTRSIZE, "[SSL VERIFY ERROR ] %s", X509_verify_cert_error_string(store->error)); writecf(FS_ERR, tmpstr); } @@ -318,13 +318,13 @@ void vc_x509store_clearflags(vc_x509store_t *store, int flags) store->flags &= ~flags; } -void vc_x509store_setcb(vc_x509store_t *store, +void vc_x509store_setcb(vc_x509store_t *store, vc_x509verify_cb_t callback) { store->callback = callback; } -void vc_x509store_set_pkeycb(vc_x509store_t *store, +void vc_x509store_set_pkeycb(vc_x509store_t *store, vc_askpass_cb_t callback) { store->askpass_callback = callback; @@ -335,31 +335,31 @@ void vc_x509store_addcert(vc_x509store_t *store, X509 *cert) sk_X509_push(store->certs, cert); } -void vc_x509store_setcafile(vc_x509store_t *store, char *file) +void vc_x509store_setcafile(vc_x509store_t *store, char *file) { free(store->cafile); store->cafile = ( file ? strdup(file) : 0 ); } -void vc_x509store_setcapath(vc_x509store_t *store, char *path) +void vc_x509store_setcapath(vc_x509store_t *store, char *path) { free(store->capath); store->capath = ( path ? strdup(path) : 0 ); } -void vc_x509store_setcrlfile(vc_x509store_t *store, char *file) +void vc_x509store_setcrlfile(vc_x509store_t *store, char *file) { free(store->crlfile); store->crlfile = ( file ? strdup(file) : 0 ); } -void vc_x509store_setkeyfile(vc_x509store_t *store, char *file) +void vc_x509store_setkeyfile(vc_x509store_t *store, char *file) { free(store->use_keyfile); store->use_keyfile = ( file ? strdup(file) : 0 ); } -void vc_x509store_setcertfile(vc_x509store_t *store, char *file) +void vc_x509store_setcertfile(vc_x509store_t *store, char *file) { free(store->use_certfile); store->use_certfile = ( file ? strdup(file) : 0 ); -- cgit v1.2.3