632439 - cms headers cmst.h and cms.h use C++ reserved identifiers 'private' and 'template'

Status: RESOLVED FIXED

(NSS :: Libraries, defect)

Description

[Elio Maldonado]

Attachment: Rename the field from private to privateInfo.

Breaks a fedora mozilla thunderbird build where its' included from C++ code.

Comment 1

[Elio Maldonado]

Attachment: V2: Rename template and private to asn1Template and privateInfo

With this patch the Thunderbird Rawhide build doesn't break.
Removed an embedded yet unrelated fix which should be submitted on its own.

Comment 2

[Elio Maldonado]

Attachment: The other cmsdecode fix

I guess I should attach it to one of the other two bugs dealing with CMS.

Comment 3

[Christopher Aillon (sabbatical, not receiving bugmail)]

Comment on attachment 511540 [details] [diff] [review]
V2: Rename template and private to asn1Template and privateInfo

>Index: ./mozilla/security/nss/lib/smime/cmscinfo.c

> SECStatus
> NSS_CMSContentInfo_Private_Init(NSSCMSContentInfo *cinfo)
> {
>-    if (cinfo->private) {
>+    if (cinfo->privateInfo) {
> 	return SECSuccess;
>     }
>-    cinfo->private = PORT_ZNew(NSSCMSContentInfoPrivate);
>-    return (cinfo->private) ? SECSuccess: SECFailure;
>+    cinfo->privateInfo = PORT_ZNew(NSSCMSContentInfoPrivate);
>+    return (cinfo->privateInfo) ? SECSuccess: SECFailure;

r=me, though a minor nit: the above ?: could use a space while you're here.

Comment 4

[Elio Maldonado]

Changes committed to trunk:
/cvsroot/mozilla/security/nss/lib/smime/cmscinfo.c,v  <--  cmscinfo.c
new revision: 1.10; previous revision: 1.9
/cvsroot/mozilla/security/nss/lib/smime/cmsdecode.c,v  <--  cmsdecode.c
new revision: 1.12; previous revision: 1.11
/cvsroot/mozilla/security/nss/lib/smime/cmsdigdata.c,v  <--  cmsdigdata.c
new revision: 1.7; previous revision: 1.6
/cvsroot/mozilla/security/nss/lib/smime/cmsencdata.c,v  <--  cmsencdata.c
new revision: 1.13; previous revision: 1.12
/cvsroot/mozilla/security/nss/lib/smime/cmsencode.c,v  <--  cmsencode.c
new revision: 1.11; previous revision: 1.10
/cvsroot/mozilla/security/nss/lib/smime/cmsenvdata.c,v  <--  cmsenvdata.c
new revision: 1.13; previous revision: 1.12
/cvsroot/mozilla/security/nss/lib/smime/cmssigdata.c,v  <--  cmssigdata.c
new revision: 1.31; previous revision: 1.30
/cvsroot/mozilla/security/nss/lib/smime/cmst.h,v  <--  cmst.h
new revision: 1.13; previous revision: 1.12
/cvsroot/mozilla/security/nss/lib/smime/cmsudf.c,v  <--  cmsudf.c
new revision: 1.3; previous revision: 1.2

Comment 5

[Elio Maldonado]

Changes committed to the NSS_312_BRANCH:
/cvsroot/mozilla/security/nss/lib/smime/cmscinfo.c,v  <--  cmscinfo.c
new revision: 1.7.192.3; previous revision: 1.7.192.2
/cvsroot/mozilla/security/nss/lib/smime/cmsdecode.c,v  <--  cmsdecode.c
new revision: 1.9.66.3; previous revision: 1.9.66.2
/cvsroot/mozilla/security/nss/lib/smime/cmsdigdata.c,v  <--  cmsdigdata.c
new revision: 1.5.192.2; previous revision: 1.5.192.1
/cvsroot/mozilla/security/nss/lib/smime/cmsencdata.c,v  <--  cmsencdata.c
new revision: 1.11.56.2; previous revision: 1.11.56.1
/cvsroot/mozilla/security/nss/lib/smime/cmsencode.c,v  <--  cmsencode.c
new revision: 1.6.66.5; previous revision: 1.6.66.4
/cvsroot/mozilla/security/nss/lib/smime/cmsenvdata.c,v  <--  cmsenvdata.c
new revision: 1.11.142.2; previous revision: 1.11.142.1
/cvsroot/mozilla/security/nss/lib/smime/cmssigdata.c,v  <--  cmssigdata.c
new revision: 1.29.142.2; previous revision: 1.29.142.1
/cvsroot/mozilla/security/nss/lib/smime/cmst.h,v  <--  cmst.h
new revision: 1.10.142.3; previous revision: 1.10.142.2
/cvsroot/mozilla/security/nss/lib/smime/cmsudf.c,v  <--  cmsudf.c
new revision: 1.1.2.4; previous revision: 1.1.2.3
/cvsroot/mozilla/security/nss/lib/smime/smime.h,v  <--  smime.h
new revision: 1.8.192.1; previous revision: 1.8

Comment 6

[Elio Maldonado]

Missed one header, now committed to the NSS_312_BRANCH:
/cvsroot/mozilla/security/nss/lib/smime/cms.h,v  <--  cms.h
new revision: 1.23.2.3; previous revision: 1.23.2.2

Comment 7

[Elio Maldonado]

Commit to the trunk also, Checking in cms.h;
/cvsroot/mozilla/security/nss/lib/smime/cms.h,v  <--  cms.h
new revision: 1.26; previous revision: 1.25

Comment 8

[Robert Relyea]

Comment on attachment 511540 [details] [diff] [review]
V2: Rename template and private to asn1Template and privateInfo

r+

Comment 9

[Robert Relyea]

Comment on attachment 511546 [details] [diff] [review]
The other cmsdecode fix

Yes, pleas attach it to a bug that explains why it's needed and why the new patch works.

bob