Merge NSS_3_14_2_RTM.

mozilla/security/nss/lib/freebl/pqg.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/. */
 
 /*
  * PQG parameter generation/verification.  Based on FIPS 186-3.
  *
- * $Id: pqg.c,v 1.25 2012/10/11 00:18:23 rrelyea%redhat.com Exp $
+ * $Id: pqg.c,v 1.26 2012/12/13 22:47:15 wtc%google.com Exp $
  */
 #ifdef FREEBL_NO_DEPEND
 #include "stubs.h"
 #endif
 
 #include "prerr.h"
 #include "secerr.h"
 
 #include "prtypes.h"
 #include "blapi.h"
@@ skipping 234 matching lines @@
     return rv;
 }
 
 HASH_HashType
 PQG_GetHashType(const PQGParams *params)
 {
     unsigned int L,N;
 
     if (params == NULL) {
         PORT_SetError(SEC_ERROR_INVALID_ARGS);
-        return SECFailure;
+        return HASH_AlgNULL;
     }
 
     L = PQG_GetLength(&params->prime)*BITS_PER_BYTE;
     N = PQG_GetLength(&params->subPrime)*BITS_PER_BYTE;
     return getFirstHash(L, N);
 }
 
 /* Get a seed for generating P and Q.  If in testing mode, copy in the
 ** seed from FIPS 186-1 appendix 5.  Otherwise, obtain bytes from the
 ** global random number generator.
@@ skipping 1566 matching lines @@
     if (vfy == NULL) 
         return;
     if (vfy->arena != NULL) {
         PORT_FreeArena(vfy->arena, PR_FALSE);   /* don't zero it */
     } else {
         SECITEM_FreeItem(&vfy->seed,   PR_FALSE); /* don't free seed */
         SECITEM_FreeItem(&vfy->h,      PR_FALSE); /* don't free h */
         PORT_Free(vfy);
     }
 }