Update NSS to NSS 3.14 Beta 1.

mozilla/security/nss/lib/freebl/shvfy.c

 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-/* $Id: shvfy.c,v 1.17 2012/06/12 16:39:00 rrelyea%redhat.com Exp $ */
+/* $Id: shvfy.c,v 1.18 2012/09/22 15:18:19 wtc%google.com Exp $ */
 
 #ifdef FREEBL_NO_DEPEND
 #include "stubs.h"
 #endif
 
 #include "shsign.h"
 #include "prlink.h"
 #include "prio.h"
 #include "blapi.h"
 #include "seccomon.h"
 #include "stdio.h"
 #include "prmem.h"
+#include "hasht.h"
+#include "pqg.h"
 
 /*
  * Most modern version of Linux support a speed optimization scheme where an
  * application called prelink modifies programs and shared libraries to quickly
  * load if they fit into an already designed address space. In short, prelink
  * scans the list of programs and libraries on your system, assigns them a
  * predefined space in the the address space, then provides the fixups to the
  * library.
 
  * The modification of the shared library is correctly detected by the freebl
@@ skipping 279 matching lines @@
 
 PRBool
 BLAPI_SHVerifyFile(const char *shName)
 {
 #ifdef PSEUDO_FIPS
     return PR_TRUE;  /* a lie, hence *pseudo* FIPS */
 #else
     char *checkName = NULL;
     PRFileDesc *checkFD = NULL;
     PRFileDesc *shFD = NULL;
-    SHA1Context *hashcx = NULL;
+    void  *hashcx = NULL;
+    const SECHashObject *hashObj = NULL;
     SECItem signature = { 0, NULL, 0 };
     SECItem hash;
     int bytesRead, offset;
     SECStatus rv;
     DSAPublicKey key;
     int count;
 #ifdef FREEBL_USE_PRELINK
     int pid = 0;
 #endif
 
     PRBool result = PR_FALSE; /* if anything goes wrong,
                                * the signature does not verify */
     unsigned char buf[4096];
-    unsigned char hashBuf[SHA1_LENGTH];
+    unsigned char hashBuf[HASH_LENGTH_MAX];
 
     PORT_Memset(&key,0,sizeof(key));
     hash.data = hashBuf;
     hash.len = sizeof(hashBuf);
 
     if (!shName) {
         goto loser;
     }
 
     /* figure out the name of our check file */
@@ skipping 54 matching lines @@
     /* read the siganture */
     rv = readItem(checkFD,&signature);
     if (rv != SECSuccess) {
         goto loser;
     }
 
     /* done with the check file */
     PR_Close(checkFD);
     checkFD = NULL;
 
+    hashObj = HASH_GetRawHashObject(PQG_GetHashType(&key.params));
+    if (hashObj == NULL) {
+        goto loser;
+    }
+
     /* open our library file */
 #ifdef FREEBL_USE_PRELINK
     shFD = bl_OpenUnPrelink(shName,&pid);
 #else
     shFD = PR_Open(shName, PR_RDONLY, 0);
 #endif
     if (shFD == NULL) {
 #ifdef DEBUG_SHVERIFY
         fprintf(stderr, "Failed to open the library file %s: (%d, %d)\n",
                 shName, (int)PR_GetError(), (int)PR_GetOSError());
 #endif /* DEBUG_SHVERIFY */
         goto loser;
     }
 
     /* hash our library file with SHA1 */
-    hashcx = SHA1_NewContext();
+    hashcx = hashObj->create();
     if (hashcx == NULL) {
         goto loser;
     }
-    SHA1_Begin(hashcx);
+    hashObj->begin(hashcx);
 
     count = 0;
     while ((bytesRead = PR_Read(shFD, buf, sizeof(buf))) > 0) {
-        SHA1_Update(hashcx, buf, bytesRead);
+        hashObj->update(hashcx, buf, bytesRead);
         count += bytesRead;
     }
 #ifdef FREEBL_USE_PRELINK
     bl_CloseUnPrelink(shFD, pid);
 #else
     PR_Close(shFD);
 #endif
     shFD = NULL;
 
-    SHA1_End(hashcx, hash.data, &hash.len, hash.len);
+    hashObj->end(hashcx, hash.data, &hash.len, hash.len);
 
 
     /* verify the hash against the check file */
     if (DSA_VerifyDigest(&key, &signature, &hash) == SECSuccess) {
         result = PR_TRUE;
     }
 #ifdef DEBUG_SHVERIFY
   {
         int i,j;
         fprintf(stderr,"File %s: %d bytes\n",shName, count);
@@ skipping 23 matching lines @@
     if (checkName != NULL) {
         PORT_Free(checkName);
     }
     if (checkFD != NULL) {
         PR_Close(checkFD);
     }
     if (shFD != NULL) {
         PR_Close(shFD);
     }
     if (hashcx != NULL) {
-        SHA1_DestroyContext(hashcx,PR_TRUE);
+        if (hashObj) {
+            hashObj->destroy(hashcx,PR_TRUE);
+        }
     }
     if (signature.data != NULL) {
         PORT_Free(signature.data);
     }
     if (key.params.prime.data != NULL) {
         PORT_Free(key.params.prime.data);
     }
     if (key.params.subPrime.data != NULL) {
         PORT_Free(key.params.subPrime.data);
     }
@@ skipping 13 matching lines @@
 {
     if (name == NULL) {
         /*
          * If name is NULL, freebl is statically linked into softoken.
          * softoken will call BLAPI_SHVerify next to verify itself.
          */
         return PR_TRUE;
     }
     return BLAPI_SHVerify(name, (PRFuncPtr) decodeInt);
 }