Merge NSS_3_14_2_RTM.

mozilla/security/nss/lib/freebl/drbg.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: drbg.c,v 1.11 2012/06/28 17:55:05 rrelyea%redhat.com Exp $ */
+/* $Id: drbg.c,v 1.12 2012/12/12 19:22:39 wtc%google.com Exp $ */
 
 #ifdef FREEBL_NO_DEPEND
 #include "stubs.h"
 #endif
 
 #include "prerror.h"
 #include "secerr.h"
 
 #include "prtypes.h"
 #include "prinit.h"
@@ skipping 448 matching lines @@
  * additional seed data before the generator is used.  A good way to
  * provide the generator with additional entropy is to call
  * RNG_SystemInfoForRNG().  Note that C_Initialize() does exactly that.
  */
 SECStatus 
 RNG_RNGInit(void)
 {
     /* Allow only one call to initialize the context */
     PR_CallOnce(&coRNGInit, rng_init);
     /* Make sure there is a context */
-    return (globalrng != NULL) ? PR_SUCCESS : PR_FAILURE;
+    return (globalrng != NULL) ? SECSuccess : SECFailure;
 }
 
 /*
 ** Update the global random number generator with more seeding
 ** material.
 */
 SECStatus 
 RNG_RandomUpdate(const void *data, size_t bytes)
 {
     SECStatus rv;
@@ skipping 422 matching lines @@
    if (rng_status == SECSuccess) {
         PORT_SetError(SEC_ERROR_LIBRARY_FAILURE);
         return SECFailure;
    }
    if (PORT_GetError() != SEC_ERROR_LIBRARY_FAILURE) {
         return rng_status;
    }
   
    return SECSuccess;
 }