mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-01-25 20:47:26 -08:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
26 lines
1.0 KiB
Diff
26 lines
1.0 KiB
Diff
RCS file: /cvsroot/mozilla/security/python/nss/src/py_nss.c,v
|
|
retrieving revision 1.23
|
|
diff -b -u -r1.23 py_nss.c
|
|
--- src/py_nss.c 6 Jun 2011 15:21:13 -0000 1.23
|
|
+++ src/py_nss.c 17 Nov 2011 21:11:40 -0000
|
|
@@ -4669,7 +4669,7 @@
|
|
}
|
|
|
|
if (params.hashAlg) {
|
|
- obj = oid_secitem_to_pystr_desc(¶ms->hashAlg->algorithm);
|
|
+ obj = oid_secitem_to_pystr_desc(¶ms.hashAlg->algorithm);
|
|
} else {
|
|
obj = PyString_FromString("default, SHA-1");
|
|
}
|
|
@@ -4677,8 +4677,8 @@
|
|
Py_CLEAR(obj);
|
|
|
|
if (params.maskAlg) {
|
|
- obj = oid_secitem_to_pystr_desc(¶ms->maskAlg->algorithm);
|
|
- if (SEC_QuickDERDecodeItem(pool, &mask_hash_alg,
|
|
+ obj = oid_secitem_to_pystr_desc(¶ms.maskAlg->algorithm);
|
|
+ if (SEC_QuickDERDecodeItem(arena, &mask_hash_alg,
|
|
SEC_ASN1_GET(SECOID_AlgorithmIDTemplate),
|
|
¶ms.maskAlg->parameters) == SECSuccess) {
|
|
obj1 = oid_secitem_to_pystr_desc(&mask_hash_alg);
|