Commit 23bab783 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

use curl standard indentation and line lengths

parent 46b112bc

lib/nss.c

+59 −55
Original line number Diff line number Diff line
@@ -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

 * 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;

}



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

  PK11SlotInfo * slot = NULL;
@@ -679,7 +680,9 @@ static SECStatus HandshakeCallback(PRFileDesc *sock, void *arg) 
  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;

  PRExplodedTime printableTime;

  char timeString[256];
@@ -822,7 +825,8 @@ static SECStatus SelectClientCert(void *arg, PRFileDesc *sock, 
      || NULL == *pRetCert) {



    if (NULL == nickname)

      failf(data, "NSS: client certificate not found (nickname not specified)");

      failf(data, "NSS: client certificate not found (nickname not "

            "specified)");

    else

      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);

          mod = NULL;

        }

        infof(data, "WARNING: failed to load NSS PEM library %s. Using OpenSSL "

              "PEM certificates will not work.\n", pem_library);

        infof(data, "WARNING: failed to load NSS PEM library %s. Using "

              "OpenSSL PEM certificates will not work.\n", pem_library);

      }

    }

#endif