[Fedora-directory-commits] coolkey/src/coolkey Makefile.am, 1.5, 1.6 Makefile.in, 1.8, 1.9 machdep.cpp, 1.3, 1.4 slot.cpp, 1.4, 1.5

[Robert Relyea (rrelyea)]

Author: rrelyea

Update of /cvs/dirsec/coolkey/src/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19672/src/coolkey

Modified Files:
	Makefile.am Makefile.in machdep.cpp slot.cpp 
Log Message:


Make file clean up:
  don't distribute .a and .la files.
  fix build problem when --enable-pk11install is not set.
  Add dist values so make dist includes the correct files.



Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.am	18 Jan 2007 01:00:25 -0000	1.5
+++ Makefile.am	14 Feb 2007 00:46:28 -0000	1.6
@@ -21,6 +21,7 @@
 
 SUBDIRS = 
 AM_CPP_FLAGS =
+EXTRA_DIST = coolkeypk11.def
 pkcs11dir = $(libdir)/pkcs11
 pkcs11_LTLIBRARIES = libcoolkeypk11.la
 
@@ -33,7 +34,6 @@
 	object.cpp \
 	PKCS11Exception.cpp \
 	slot.cpp    \
-	config.h \
 	locking.h \
 	log.h \
 	machdep.h \
@@ -65,6 +65,10 @@
 clean-generic:
 	rm -f coolkeypk11.sym
 
+# remove the static and libtool libraries if necessary
+install-data-hook:
+	rm -f $(DESTDIR)$(pkcs11dir)/libcoolkeypk11.a
+	rm -f $(DESTDIR)$(pkcs11dir)/libcoolkeypk11.la
 
 
 #MODULE = coolkeypk11


Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.in	18 Jan 2007 01:00:55 -0000	1.8
+++ Makefile.in	14 Feb 2007 00:46:28 -0000	1.9
@@ -234,6 +234,7 @@
 target_vendor = @target_vendor@
 SUBDIRS = 
 AM_CPP_FLAGS = 
+EXTRA_DIST = coolkeypk11.def
 pkcs11dir = $(libdir)/pkcs11
 pkcs11_LTLIBRARIES = libcoolkeypk11.la
 libcoolkeypk11_la_SOURCES = \
@@ -245,7 +246,6 @@
 	object.cpp \
 	PKCS11Exception.cpp \
 	slot.cpp    \
-	config.h \
 	locking.h \
 	log.h \
 	machdep.h \
@@ -655,6 +655,8 @@
 info-am:
 
 install-data-am: install-pkcs11LTLIBRARIES
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 
 install-exec-am:
 
@@ -692,14 +694,15 @@
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-recursive distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-pkcs11LTLIBRARIES \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-info-am uninstall-pkcs11LTLIBRARIES
+	install-data-am install-data-hook install-exec install-exec-am \
+	install-info install-info-am install-man \
+	install-pkcs11LTLIBRARIES install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic maintainer-clean-recursive \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am uninstall-info-am \
+	uninstall-pkcs11LTLIBRARIES
 
 
 #
@@ -713,6 +716,11 @@
 clean-generic:
 	rm -f coolkeypk11.sym
 
+# remove the static and libtool libraries if necessary
+install-data-hook:
+	rm -f $(DESTDIR)$(pkcs11dir)/libcoolkeypk11.a
+	rm -f $(DESTDIR)$(pkcs11dir)/libcoolkeypk11.la
+
 #MODULE = coolkeypk11
 #REQUIRES = ckyapplet zlib
 #USE_STATIC_RTL=1


Index: machdep.cpp
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/machdep.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- machdep.cpp	7 Sep 2006 20:57:20 -0000	1.3
+++ machdep.cpp	14 Feb 2007 00:46:28 -0000	1.4
@@ -247,7 +247,9 @@
 	// from getSHMemAddr.
 	return NULL;
     }
+    int mask = umask(0);
     int ret = mkdir (MEMSEGPATH, 0777);
+    umask(mask);
     if ((ret == -1) && (errno != EEXIST)) {
 	delete shmemData;
 	return NULL;


Index: slot.cpp
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/slot.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- slot.cpp	30 Nov 2006 23:24:46 -0000	1.4
+++ slot.cpp	14 Feb 2007 00:46:28 -0000	1.5
@@ -625,14 +625,10 @@
 	    return;
 	}
 	state |= CAC_CARD | APPLET_SELECTABLE | APPLET_PERSONALIZED;
-	/* ARG CAC is evil. once you've selected an applet, you cannot
-	 * select the card manager unless you reset the card...
-	 * ... even removing and reinserting the card does not change the
-	 * applet selection,
-	 * do so reset the card now  so we can get the CUID 
-	 * NOTE: this will cause other apps to loose login state!
-	CKYCardConnection_Reset(conn);
-        readCUID(); /* get the CUID before we loose the ability to */
+	/* skip the read of the cuid. We really don't need it and,
+         * the only way to get it from the cac is to reset it.
+         * other apps may be running now, so resetting the cac is a bit
+         * unfriendly */
 	isVersion1Key = 0;
 	needLogin = 1;
 
@@ -692,6 +688,8 @@
 {
     if (isVersion1Key) {
 	if (hard) {
+	    reverify = false; /* no need to revalidate in the future,
+	                       * we're clearing the nonce now */
 	    nonceValid = false;
 	    CKYBuffer_Zero(&nonce);
 	    CKYBuffer_Resize(&nonce,8);