Commit a2e45a22 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

code style cleanup

parent 621c2b90

lib/nss.c

+40 −24
Original line number Diff line number Diff line
@@ -313,16 +313,20 @@ nss_load_cert(const char *filename, PRBool cacert) 
    return 0;

  }



  PK11_SETATTRS(attrs, CKA_CLASS, &objClass, sizeof(objClass) ); attrs++;

  PK11_SETATTRS(attrs, CKA_TOKEN, &cktrue, sizeof(CK_BBOOL) ); attrs++;

  PK11_SETATTRS(attrs, CKA_CLASS, &objClass, sizeof(objClass) );

  attrs++;

  PK11_SETATTRS(attrs, CKA_TOKEN, &cktrue, sizeof(CK_BBOOL) );

  attrs++;

  PK11_SETATTRS(attrs, CKA_LABEL, (unsigned char *)filename,

                strlen(filename)+1); attrs++;

                strlen(filename)+1);

  attrs++;

  if(cacert) {

    PK11_SETATTRS(attrs, CKA_TRUST, &cktrue, sizeof(CK_BBOOL) ); attrs++;

    PK11_SETATTRS(attrs, CKA_TRUST, &cktrue, sizeof(CK_BBOOL) );

  }

  else {

    PK11_SETATTRS(attrs, CKA_TRUST, &ckfalse, sizeof(CK_BBOOL) ); attrs++;

    PK11_SETATTRS(attrs, CKA_TRUST, &ckfalse, sizeof(CK_BBOOL) );

  }

  attrs++;



  /* This load the certificate in our PEM module into the appropriate

   * slot.
@@ -382,38 +386,49 @@ static int nss_load_crl(char* crlfilename, PRBool ascii) 
  }

  crlDER.data = NULL;

  prstat = PR_GetOpenFileInfo(infile,&info);

  if (prstat!=PR_SUCCESS) return 0;

  if (prstat!=PR_SUCCESS)

    return 0;

  if (ascii) {

    SECItem filedata;

    char *asc,*body;

    filedata.data = NULL;

    if (!SECITEM_AllocItem(NULL,&filedata,info.size)) return 0;

    if (!SECITEM_AllocItem(NULL,&filedata,info.size))

      return 0;

    nb = PR_Read(infile,filedata.data,info.size);

    if (nb!=info.size) return 0;

    if (nb!=info.size)

      return 0;

    asc = (char*)filedata.data;

    if (!asc) {

    if (!asc)

      return 0;

    }

    if ((body=strstr(asc,"-----BEGIN")) != NULL) {



    body=strstr(asc,"-----BEGIN");

    if (body != NULL) {

      char *trailer=NULL;

      asc = body;

      body = PORT_Strchr(asc,'\n');

      if (!body) body = PORT_Strchr(asc,'\r');

      if (body) trailer = strstr(++body,"-----END");

      if (trailer!=NULL) *trailer='\0';

      else return 0;

      if (!body)

        body = PORT_Strchr(asc,'\r');

      if (body)

        trailer = strstr(++body,"-----END");

      if (trailer!=NULL)

        *trailer='\0';

      else

        return 0;

    }

    else {

      body = asc;

    }

    rv = ATOB_ConvertAsciiToItem(&crlDER,body);

    PORT_Free(filedata.data);

    if (rv) return 0;

    if (rv)

      return 0;

  }

  else {

    if (!SECITEM_AllocItem(NULL,&crlDER,info.size)) return 0;

    if (!SECITEM_AllocItem(NULL,&crlDER,info.size))

      return 0;

    nb = PR_Read(infile,crlDER.data,info.size);

    if (nb!=info.size) return 0;

    if (nb!=info.size)

      return 0;

  }



  slot = PK11_GetInternalKeySlot();
@@ -728,7 +743,8 @@ static void display_conn_info(struct connectdata *conn, PRFileDesc *sock) 
 * issuer check, so we provide comments that mimic the OpenSSL

 * X509_check_issued function (in x509v3/v3_purp.c)

 */

static SECStatus check_issuer_cert(struct connectdata *conn, PRFileDesc *sock, char* issuer_nickname)

static SECStatus check_issuer_cert(struct connectdata *conn, PRFileDesc *sock,

                                   char* issuer_nickname)

{

  CERTCertificate *cert,*cert_issuer,*issuer;

  SECStatus res=SECSuccess;