|
 |
6fbbf4 |
diff -up ./nss/lib/freebl/cts.c.1154764extras ./nss/lib/freebl/cts.c
|
|
|
6fbbf4 |
--- ./nss/lib/freebl/cts.c.1154764extras 2015-01-12 13:53:36.393855248 -0800
|
|
|
6fbbf4 |
+++ ./nss/lib/freebl/cts.c 2015-01-12 13:53:36.548856551 -0800
|
|
|
6fbbf4 |
@@ -97,7 +97,7 @@ CTS_EncryptUpdate(CTSContext *cts, unsig
|
|
|
6fbbf4 |
unsigned int tmp;
|
|
|
6fbbf4 |
int fullblocks;
|
|
|
6fbbf4 |
int written;
|
|
|
6fbbf4 |
- char *saveout = outbuf;
|
|
|
6fbbf4 |
+ char *saveout = (char *) outbuf;
|
|
|
6fbbf4 |
SECStatus rv;
|
|
|
6fbbf4 |
|
|
|
6fbbf4 |
if (inlen < blocksize) {
|
|
|
6fbbf4 |
@@ -187,7 +187,7 @@ CTS_DecryptUpdate(CTSContext *cts, unsig
|
|
|
6fbbf4 |
unsigned char Cn[MAX_BLOCK_SIZE]; /* block Cn */
|
|
|
6fbbf4 |
unsigned char lastBlock[MAX_BLOCK_SIZE];
|
|
|
6fbbf4 |
const unsigned char *tmp;
|
|
|
6fbbf4 |
- char *saveout = outbuf;
|
|
|
6fbbf4 |
+ char *saveout = (char *) outbuf;
|
|
|
6fbbf4 |
unsigned int tmpLen;
|
|
|
6fbbf4 |
int fullblocks, pad;
|
|
|
6fbbf4 |
unsigned int i;
|
|
|
6fbbf4 |
diff -up ./nss/lib/freebl/ldvector.c.1154764extras ./nss/lib/freebl/ldvector.c
|
|
|
6fbbf4 |
--- ./nss/lib/freebl/ldvector.c.1154764extras 2015-01-12 13:53:36.541856492 -0800
|
|
|
6fbbf4 |
+++ ./nss/lib/freebl/ldvector.c 2015-01-12 13:53:36.549856559 -0800
|
|
|
6fbbf4 |
@@ -339,8 +339,6 @@ static const struct NSSLOWVectorStr nssv
|
|
|
6fbbf4 |
const NSSLOWVector *
|
|
|
6fbbf4 |
NSSLOW_GetVector(void)
|
|
|
6fbbf4 |
{
|
|
|
6fbbf4 |
- SECStatus rv;
|
|
|
6fbbf4 |
-
|
|
|
6fbbf4 |
/* POST check and stub init happens in FREEBL_GetVector() and
|
|
|
6fbbf4 |
* NSSLOW_Init() respectively */
|
|
|
6fbbf4 |
return &nssvector;
|
|
|
6fbbf4 |
diff -up ./nss/lib/freebl/lowhash_vector.c.1154764extras ./nss/lib/freebl/lowhash_vector.c
|
|
|
6fbbf4 |
--- ./nss/lib/freebl/lowhash_vector.c.1154764extras 2015-01-12 13:53:36.542856500 -0800
|
|
|
6fbbf4 |
+++ ./nss/lib/freebl/lowhash_vector.c 2015-01-12 13:53:36.549856559 -0800
|
|
|
6fbbf4 |
@@ -107,8 +107,6 @@ static PRCallOnceType loadFreeBLOnce;
|
|
|
6fbbf4 |
static PRStatus
|
|
|
6fbbf4 |
freebl_RunLoaderOnce( void )
|
|
|
6fbbf4 |
{
|
|
|
6fbbf4 |
- PRStatus status;
|
|
|
6fbbf4 |
-
|
|
|
6fbbf4 |
/* Don't have NSPR, so can use the real PR_CallOnce, implement a stripped
|
|
|
6fbbf4 |
* down version. */
|
|
|
6fbbf4 |
if (loadFreeBLOnce.initialized) {
|
|
|
6fbbf4 |
diff -up ./nss/lib/freebl/rsa.c.1154764extras ./nss/lib/freebl/rsa.c
|
|
|
6fbbf4 |
--- ./nss/lib/freebl/rsa.c.1154764extras 2015-01-12 13:53:36.479855971 -0800
|
|
|
6fbbf4 |
+++ ./nss/lib/freebl/rsa.c 2015-01-12 13:53:36.549856559 -0800
|
|
|
6fbbf4 |
@@ -343,11 +343,10 @@ RSA_NewKey(int keySizeInBits, SECItem *p
|
|
|
6fbbf4 |
if (rsa_fips186_verify(&p, &q, &d, keySizeInBits) ){
|
|
|
6fbbf4 |
break;
|
|
|
6fbbf4 |
}
|
|
|
6fbbf4 |
- prerr = PORT_GetError();
|
|
|
6fbbf4 |
- } else {
|
|
|
6fbbf4 |
prerr = SEC_ERROR_NEED_RANDOM; /* retry with different values */
|
|
|
6fbbf4 |
+ } else {
|
|
|
6fbbf4 |
+ prerr = PORT_GetError();
|
|
|
6fbbf4 |
}
|
|
|
6fbbf4 |
- prerr = PORT_GetError();
|
|
|
6fbbf4 |
kiter++;
|
|
|
6fbbf4 |
/* loop until have primes */
|
|
|
6fbbf4 |
} while (prerr == SEC_ERROR_NEED_RANDOM && kiter < max_attempts);
|
|
|
6fbbf4 |
diff -up ./nss/lib/softoken/legacydb/lgfips.c.1154764extras ./nss/lib/softoken/legacydb/lgfips.c
|
|
|
6fbbf4 |
--- ./nss/lib/softoken/legacydb/lgfips.c.1154764extras 2015-01-12 13:53:36.386855189 -0800
|
|
|
6fbbf4 |
+++ ./nss/lib/softoken/legacydb/lgfips.c 2015-01-12 13:53:36.550856568 -0800
|
|
|
6fbbf4 |
@@ -81,7 +81,6 @@ static void
|
|
|
6fbbf4 |
lg_startup_tests(void)
|
|
|
6fbbf4 |
{
|
|
|
6fbbf4 |
PRBool fipsInstalled;
|
|
|
6fbbf4 |
- SECStatus rv;
|
|
|
6fbbf4 |
const char *libraryName = LG_LIB_NAME;
|
|
|
6fbbf4 |
|
|
|
6fbbf4 |
PORT_Assert(!sftk_self_tests_ran);
|