diff options
| author | beat <beat@FreeBSD.org> | 2009-09-10 01:19:23 +0800 |
|---|---|---|
| committer | beat <beat@FreeBSD.org> | 2009-09-10 01:19:23 +0800 |
| commit | fcb928fad631a7e786df9fcd81fe57cd3ddc5d84 (patch) | |
| tree | e2755d7f71a04d8fd967c98350bf20aab9089195 | |
| parent | 7a33497c618e8d8b1de27ee8226b2beef6c01108 (diff) | |
| download | freebsd-ports-gnome-fcb928fad631a7e786df9fcd81fe57cd3ddc5d84.tar.gz freebsd-ports-gnome-fcb928fad631a7e786df9fcd81fe57cd3ddc5d84.tar.zst freebsd-ports-gnome-fcb928fad631a7e786df9fcd81fe57cd3ddc5d84.zip | |
- Fix build after recent NSS update
Reported by: pointyhat via miwi
Obtained from: Mozilla Bugzilla (Bug 399589)
With hat: gecko
| -rw-r--r-- | www/xulrunner/files/patch-security-manager-ssl-src-nsKeygenHandler.cpp | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/www/xulrunner/files/patch-security-manager-ssl-src-nsKeygenHandler.cpp b/www/xulrunner/files/patch-security-manager-ssl-src-nsKeygenHandler.cpp new file mode 100644 index 000000000000..60066ae0438c --- /dev/null +++ b/www/xulrunner/files/patch-security-manager-ssl-src-nsKeygenHandler.cpp @@ -0,0 +1,55 @@ +--- security/manager/ssl/src/nsKeygenHandler.cpp.orig 2005-07-20 21:31:22.000000000 +0200 ++++ security/manager/ssl/src/nsKeygenHandler.cpp 2008-02-02 00:08:05.000000000 +0100 +@@ -70,16 +70,25 @@ + + //All possible key size choices. + static SECKeySizeChoiceInfo SECKeySizeChoiceList[] = { + { nsnull, 2048 }, + { nsnull, 1024 }, + { nsnull, 0 }, + }; + ++DERTemplate SECAlgorithmIDTemplate[] = { ++ { DER_SEQUENCE, ++ 0, NULL, sizeof(SECAlgorithmID) }, ++ { DER_OBJECT_ID, ++ offsetof(SECAlgorithmID,algorithm), }, ++ { DER_OPTIONAL | DER_ANY, ++ offsetof(SECAlgorithmID,parameters), }, ++ { 0, } ++}; + + DERTemplate CERTSubjectPublicKeyInfoTemplate[] = { + { DER_SEQUENCE, + 0, nsnull, sizeof(CERTSubjectPublicKeyInfo) }, + { DER_INLINE, + offsetof(CERTSubjectPublicKeyInfo,algorithm), + SECAlgorithmIDTemplate, }, + { DER_BIT_STRING, +@@ -90,26 +99,16 @@ + DERTemplate CERTPublicKeyAndChallengeTemplate[] = + { + { DER_SEQUENCE, 0, nsnull, sizeof(CERTPublicKeyAndChallenge) }, + { DER_ANY, offsetof(CERTPublicKeyAndChallenge,spki), }, + { DER_IA5_STRING, offsetof(CERTPublicKeyAndChallenge,challenge), }, + { 0, } + }; + +-DERTemplate SECAlgorithmIDTemplate[] = { +- { DER_SEQUENCE, +- 0, NULL, sizeof(SECAlgorithmID) }, +- { DER_OBJECT_ID, +- offsetof(SECAlgorithmID,algorithm), }, +- { DER_OPTIONAL | DER_ANY, +- offsetof(SECAlgorithmID,parameters), }, +- { 0, } +-}; +- + const SEC_ASN1Template SECKEY_PQGParamsTemplate[] = { + { SEC_ASN1_SEQUENCE, 0, NULL, sizeof(PQGParams) }, + { SEC_ASN1_INTEGER, offsetof(PQGParams,prime) }, + { SEC_ASN1_INTEGER, offsetof(PQGParams,subPrime) }, + { SEC_ASN1_INTEGER, offsetof(PQGParams,base) }, + { 0, } + }; + |