rpms/nss
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- fix a C++ mode compilation error

Browse Source
This commit is contained in:
Kai Engert 2007-09-06 16:06:32 +00:00
parent 3b9b992cb2
commit 8f343923c1
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nss-create-obj.patch
View File

@ -49,7 +49,7 @@ diff -u -r1.11.2.3 pk11obj.c
+ * Hand Create a new object and return the Generic object for our new object. + * Hand Create a new object and return the Generic object for our new object.
+ */ + */
+PK11GenericObject * +PK11GenericObject *
+PK11_CreateGenericObject(PK11SlotInfo *slot, const CK_ATTRIBUTE *template, +PK11_CreateGenericObject(PK11SlotInfo *slot, const CK_ATTRIBUTE *template_,
+ int count, PRBool token) + int count, PRBool token)
+{ +{
+ CK_OBJECT_HANDLE objectID; + CK_OBJECT_HANDLE objectID;
@ -57,7 +57,7 @@ diff -u -r1.11.2.3 pk11obj.c
+ CK_RV crv; + CK_RV crv;
+ +
+ PK11_EnterSlotMonitor(slot); + PK11_EnterSlotMonitor(slot);
+ crv = PK11_CreateNewObject(slot, slot->session, template, count, + crv = PK11_CreateNewObject(slot, slot->session, template_, count,
+ token, &objectID); + token, &objectID);
+ PK11_ExitSlotMonitor(slot); + PK11_ExitSlotMonitor(slot);
+ if (crv != CKR_OK) { + if (crv != CKR_OK) {
@ -150,7 +150,7 @@ diff -u -r1.14.2.1 pk11pub.h
SECStatus PK11_DestroyGenericObjects(PK11GenericObject *object); SECStatus PK11_DestroyGenericObjects(PK11GenericObject *object);
SECStatus PK11_DestroyGenericObject(PK11GenericObject *object); SECStatus PK11_DestroyGenericObject(PK11GenericObject *object);
+PK11GenericObject *PK11_CreateGenericObject(PK11SlotInfo *slot, +PK11GenericObject *PK11_CreateGenericObject(PK11SlotInfo *slot,
+ const CK_ATTRIBUTE *template, + const CK_ATTRIBUTE *template_,
+ int count, PRBool token); + int count, PRBool token);
SECStatus PK11_ReadRawAttribute(PK11ObjectType type, void *object, SECStatus PK11_ReadRawAttribute(PK11ObjectType type, void *object,
CK_ATTRIBUTE_TYPE attr, SECItem *item); CK_ATTRIBUTE_TYPE attr, SECItem *item);

5
nss.spec
View File

@ -7,7 +7,7 @@
Summary: Network Security Services Summary: Network Security Services
Name: nss Name: nss
Version: 3.11.7 Version: 3.11.7
Release: 7%{?dist} Release: 8%{?dist}
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
URL: http://www.mozilla.org/projects/security/pki/nss/ URL: http://www.mozilla.org/projects/security/pki/nss/
Group: System Environment/Libraries Group: System Environment/Libraries
@ -453,6 +453,9 @@ done
%changelog %changelog
* Thu Sep 06 2007 Kai Engert <kengert@redhat.com> - 3.11.7-8
- fix a C++ mode compilation error
* Wed Sep 05 2007 Bob Relyea <rrelyea@redhat.com> - 3.11.7-7 * Wed Sep 05 2007 Bob Relyea <rrelyea@redhat.com> - 3.11.7-7
- Add 3.12 ckfw and libnsspem - Add 3.12 ckfw and libnsspem