moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-16 22:45:03 -05:00
Code Issues Releases Wiki Activity

use curl standard indentation and line lengths

Browse Source
This commit is contained in:
Daniel Stenberg 2010-02-17 12:13:55 +00:00
parent 46b112bcd4
commit 23bab783d4
1 changed files with 55 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/nss.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -486,7 +486,8 @@ static int nss_load_crl(const char* crlfilename, PRBool ascii)
return 1; return 1;
} }
static int nss_load_key(struct connectdata *conn, int sockindex, char *key_file) static int nss_load_key(struct connectdata *conn, int sockindex,
char *key_file)
{ {
#ifdef HAVE_PK11_CREATEGENERICOBJECT #ifdef HAVE_PK11_CREATEGENERICOBJECT
PK11SlotInfo * slot = NULL; PK11SlotInfo * slot = NULL;
@ -679,7 +680,9 @@ static SECStatus HandshakeCallback(PRFileDesc *sock, void *arg)
return SECSuccess; return SECSuccess;
} }
static void display_cert_info(struct SessionHandle *data, CERTCertificate *cert) { static void display_cert_info(struct SessionHandle *data,
CERTCertificate *cert)
{
char *subject, *issuer, *common_name; char *subject, *issuer, *common_name;
PRExplodedTime printableTime; PRExplodedTime printableTime;
char timeString[256]; char timeString[256];
@ -822,7 +825,8 @@ static SECStatus SelectClientCert(void *arg, PRFileDesc *sock,
|| NULL == *pRetCert) { || NULL == *pRetCert) {
if (NULL == nickname) if (NULL == nickname)
failf(data, "NSS: client certificate not found (nickname not specified)"); failf(data, "NSS: client certificate not found (nickname not "
"specified)");
else else
failf(data, "NSS: client certificate not found: %s", nickname); failf(data, "NSS: client certificate not found: %s", nickname);
@ -1079,8 +1083,8 @@ CURLcode Curl_nss_connect(struct connectdata *conn, int sockindex)
SECMOD_DestroyModule(mod); SECMOD_DestroyModule(mod);
mod = NULL; mod = NULL;
} }
infof(data, "WARNING: failed to load NSS PEM library %s. Using OpenSSL " infof(data, "WARNING: failed to load NSS PEM library %s. Using "
"PEM certificates will not work.\n", pem_library); "OpenSSL PEM certificates will not work.\n", pem_library);
} }
} }
#endif #endif