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

Unified Diff: mozilla/security/nss/lib/certdb/alg1485.c

Issue 606034: NSS: update to 3.12.6 RC0 (Closed)
Patch Set: Created 10 years, 10 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
Index: mozilla/security/nss/lib/certdb/alg1485.c
diff --git a/mozilla/security/nss/lib/certdb/alg1485.c b/mozilla/security/nss/lib/certdb/alg1485.c
index 5fc20295def4d9a51b94058081b87d2b89bd23ba..80968b490d599868f32e72d12406267083dd6777 100644
--- a/mozilla/security/nss/lib/certdb/alg1485.c
+++ b/mozilla/security/nss/lib/certdb/alg1485.c
@@ -458,7 +458,7 @@ ParseRFC1485AVA(PRArenaPool *arena, char **pbp, char *endptr)
vt = SEC_ASN1_UTF8_STRING;
}
- derVal.data = valBuf;
+ derVal.data = (unsigned char*) valBuf;
derVal.len = valLen;
a = CERT_CreateAVAFromSECItem(arena, kind, vt, &derVal);
}
@@ -981,7 +981,7 @@ AppendAVA(stringBuf *bufp, CERTAVA *ava, CertStrictnessLevel strict)
nameLen = strlen(tagName);
valueLen = (useHex ? avaValue->len :
- cert_RFC1485_GetRequiredLen(avaValue->data, avaValue->len,
+ cert_RFC1485_GetRequiredLen((char *)avaValue->data, avaValue->len,
&mode));
len = nameLen + valueLen + 2; /* Add 2 for '=' and trailing NUL */
@@ -1194,8 +1194,8 @@ avaToString(PRArenaPool *arena, CERTAVA *ava)
if(!avaValue) {
return buf;
}
- valueLen = cert_RFC1485_GetRequiredLen(avaValue->data, avaValue->len,
- NULL) + 1;
+ valueLen = cert_RFC1485_GetRequiredLen((char *)avaValue->data,
+ avaValue->len, NULL) + 1;
if (arena) {
buf = (char *)PORT_ArenaZAlloc(arena, valueLen);
} else {
« README.chromium ('K') | « README.chromium ('k') | mozilla/security/nss/lib/certdb/certdb.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698