Attachment #217843 for bug #302769

Lines 124-132 then Link Here

(-)./configure.in.coolkey-simple-bugs (-2 / +2 lines)
124	if test $WINDOWS -ne 1; then	124	if test $WINDOWS -ne 1; then
125	PKG_CHECK_MODULES(NSS, nss, true, [ AC_MSG_ERROR(could not find NSS Crypto libraries) ])	125	PKG_CHECK_MODULES(NSS, nss, true, [ AC_MSG_ERROR(could not find NSS Crypto libraries) ])
126	fi	126	fi
127	enable_pk11install = "yes"	127	enable_pk11install="yes"
128	else	128	else
129	enable_pk11install = "no"	129	enable_pk11install="no"
130	AC_MSG_WARN([skipping pk11install])	130	AC_MSG_WARN([skipping pk11install])
131	fi	131	fi
132		132

Lines 25-31 if BUILD_PK11INSTALL Link Here

(-)./Makefile.am.coolkey-simple-bugs (-1 lines)
25	SUBDIRS += src/install	25	SUBDIRS += src/install
26	endif	26	endif
27		27
28	ACLOCAL_AMFLAGS = -I m4
29		28
30	EXTRA_DIST = cookey.spec LICENSE	29	EXTRA_DIST = cookey.spec LICENSE
31		30

Lines 397-403 PKCS11Object::getLabel() Link Here

(-)./src/coolkey/object.cpp.coolkey-simple-bugs (-1 / +1 lines)
397	{	397	{
398	// clean up old one	398	// clean up old one
399	if (label) {	399	if (label) {
400	delete label;	400	delete [] label;
401	label = NULL;	401	label = NULL;
402	}	402	}
403	// find matching attribute	403	// find matching attribute

Lines 82-88 class PKCS11Object { Link Here

(-)./src/coolkey/object.h.coolkey-simple-bugs (-1 / +1 lines)
82	PKCS11Object(unsigned long muscleObjID, CK_OBJECT_HANDLE handle);	82	PKCS11Object(unsigned long muscleObjID, CK_OBJECT_HANDLE handle);
83	PKCS11Object(unsigned long muscleObjID, const CKYBuffer *data,	83	PKCS11Object(unsigned long muscleObjID, const CKYBuffer *data,
84	CK_OBJECT_HANDLE handle);	84	CK_OBJECT_HANDLE handle);
85	~PKCS11Object() { delete label; delete name; CKYBuffer_FreeData(&pubKey); }	85	~PKCS11Object() { delete [] label; delete [] name; CKYBuffer_FreeData(&pubKey); }
86		86
87	PKCS11Object(const PKCS11Object& cpy) :	87	PKCS11Object(const PKCS11Object& cpy) :
88	attributes(cpy.attributes), muscleObjID(cpy.muscleObjID),	88	attributes(cpy.attributes), muscleObjID(cpy.muscleObjID),

Lines 979-985 Slot::makeLabelString(char *label, int m Link Here

(-)./src/coolkey/slot.cpp.coolkey-simple-bugs (-2 / +2 lines)
979	//	979	//
980	#define COOLKEY "CoolKey"	980	#define COOLKEY "CoolKey"
981	#define POSSESSION " for "	981	#define POSSESSION " for "
982	if (!personName \|\| personName == "") {	982	if (!personName \|\| personName[0] == '\0' ) {
983	const int coolKeySize = sizeof(COOLKEY) ;	983	const int coolKeySize = sizeof(COOLKEY) ;
984	memcpy(label, COOLKEY, coolKeySize-1);	984	memcpy(label, COOLKEY, coolKeySize-1);
985	makeSerialString(&label[coolKeySize], maxSize-coolKeySize, cuid);	985	makeSerialString(&label[coolKeySize], maxSize-coolKeySize, cuid);
Lines 1528-1534 SlotMemSegment::SlotMemSegment(const cha Link Here
1528	}	1528	}
1529	sprintf(segName,SEGMENT_PREFIX"%s",readerName);	1529	sprintf(segName,SEGMENT_PREFIX"%s",readerName);
1530	segment = SHMem::initSegment(segName, MAX_OBJECT_STORE_SIZE, needInit);	1530	segment = SHMem::initSegment(segName, MAX_OBJECT_STORE_SIZE, needInit);
1531	delete segName;	1531	delete [] segName;
1532	if (!segment) {	1532	if (!segment) {
1533	// just run without shared memory	1533	// just run without shared memory
1534	return;	1534	return;

Return to bug 302769