Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Unified Diff: nss/lib/freebl/rsa.c

Issue 16132005: Allow NSS to be built with NO_NSPR_10_SUPPORT. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « nss/lib/freebl/pqg.c ('k') | nss/lib/freebl/sha512.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: nss/lib/freebl/rsa.c
===================================================================
--- nss/lib/freebl/rsa.c (revision 203524)
+++ nss/lib/freebl/rsa.c (working copy)
@@ -239,7 +239,7 @@
SECStatus rv = SECSuccess;
int prerr = 0;
RSAPrivateKey *key = NULL;
- PRArenaPool *arena = NULL;
+ PLArenaPool *arena = NULL;
/* Require key size to be a multiple of 16 bits. */
if (!publicExponent || keySizeInBits % 16 != 0 ||
BAD_RSA_KEY_SIZE(keySizeInBits/8, publicExponent->len)) {
@@ -260,7 +260,7 @@
}
key->arena = arena;
/* length of primes p and q (in bytes) */
- primeLen = keySizeInBits / (2 * BITS_PER_BYTE);
+ primeLen = keySizeInBits / (2 * PR_BITS_PER_BYTE);
MP_DIGITS(&p) = 0;
MP_DIGITS(&q) = 0;
MP_DIGITS(&e) = 0;
@@ -653,7 +653,7 @@
SECStatus
RSA_PopulatePrivateKey(RSAPrivateKey *key)
{
- PRArenaPool *arena = NULL;
+ PLArenaPool *arena = NULL;
PRBool needPublicExponent = PR_TRUE;
PRBool needPrivateExponent = PR_TRUE;
PRBool hasModulus = PR_FALSE;
@@ -712,7 +712,7 @@
if (key->prime1.data[0] == 0) {
primeLen--;
}
- keySizeInBits = primeLen * 2 * BITS_PER_BYTE;
+ keySizeInBits = primeLen * 2 * PR_BITS_PER_BYTE;
SECITEM_TO_MPINT(key->prime1, &p);
prime_count++;
}
@@ -721,7 +721,7 @@
if (key->prime2.data[0] == 0) {
primeLen--;
}
- keySizeInBits = primeLen * 2 * BITS_PER_BYTE;
+ keySizeInBits = primeLen * 2 * PR_BITS_PER_BYTE;
SECITEM_TO_MPINT(key->prime2, prime_count ? &q : &p);
prime_count++;
}
@@ -731,7 +731,7 @@
if (key->modulus.data[0] == 0) {
modLen--;
}
- keySizeInBits = modLen * BITS_PER_BYTE;
+ keySizeInBits = modLen * PR_BITS_PER_BYTE;
SECITEM_TO_MPINT(key->modulus, &n);
hasModulus = PR_TRUE;
}
@@ -1354,7 +1354,7 @@
}
static SECStatus
-swap_in_key_value(PRArenaPool *arena, mp_int *mpval, SECItem *buffer)
+swap_in_key_value(PLArenaPool *arena, mp_int *mpval, SECItem *buffer)
{
int len;
mp_err err = MP_OKAY;
« no previous file with comments | « nss/lib/freebl/pqg.c ('k') | nss/lib/freebl/sha512.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698