esc/src/lib/coolkey CoolKey.cpp, 1.10, 1.11 CoolKey.h, 1.8, 1.9 Makefile, 1.2, 1.3 manifest.mn, 1.5, 1.6

[Jack Magne]

Author: jmagne

Update of /cvs/dirsec/esc/src/lib/coolkey
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27580/lib/coolkey

Modified Files:
	CoolKey.cpp CoolKey.h Makefile manifest.mn 
Log Message:
Bugzilla#479722 ESC to TPS SSL communication problem with renewed TPS cert.


Index: CoolKey.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/coolkey/CoolKey.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- CoolKey.cpp	13 Jun 2009 23:44:52 -0000	1.10
+++ CoolKey.cpp	19 Jun 2009 21:03:40 -0000	1.11
@@ -259,12 +259,14 @@
 static CoolKeyRelease g_Release = NULL;
 static CoolKeyGetConfigValue g_GetConfigValue = NULL;
 static CoolKeySetConfigValue g_SetConfigValue = NULL;
+static CoolKeyBadCertHandler g_BadCertHandler = NULL;
 
 char* CoolKeyVerifyPassword(PK11SlotInfo *,PRBool,void *);
 
 COOLKEY_API HRESULT CoolKeySetCallbacks(CoolKeyDispatch dispatch,
 	CoolKeyReference reference, CoolKeyRelease release,
-        CoolKeyGetConfigValue getconfigvalue,CoolKeySetConfigValue setconfigvalue)
+        CoolKeyGetConfigValue getconfigvalue,CoolKeySetConfigValue setconfigvalue,
+        CoolKeyBadCertHandler badcerthandler)
 {
     char tBuff[56];
     g_Dispatch = dispatch;
@@ -272,6 +274,7 @@
     g_Release = release;
     g_GetConfigValue = getconfigvalue;
     g_SetConfigValue = setconfigvalue;
+    g_BadCertHandler = badcerthandler;
 
     char * suppressPINPrompt =(char*) CoolKeyGetConfig("esc.security.url");
 
@@ -1300,6 +1303,13 @@
     return aCUID;
 }
 
+CoolKeyBadCertHandler CoolKeyGetBadCertHandler()
+{
+    if(g_BadCertHandler)
+        return g_BadCertHandler;
+    return NULL;
+}
+
 const char *CoolKeyGetConfig(const char *aValue)
 {
     if(!g_GetConfigValue || ! aValue)


Index: CoolKey.h
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/coolkey/CoolKey.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CoolKey.h	13 Jun 2009 23:44:52 -0000	1.8
+++ CoolKey.h	19 Jun 2009 21:03:40 -0000	1.9
@@ -26,6 +26,7 @@
 // platforms (coreconf will do the appropriate processing.
 #define COOLKEY_API
 
+#include "ssl.h"
 #include <string.h>
 #include <stdlib.h>
 #include <vector>
@@ -100,7 +101,7 @@
 
 typedef HRESULT (*CoolKeySetConfigValue)(const char *name,const char *value);
 typedef const char * (*CoolKeyGetConfigValue)(const char *name);
-
+typedef SECStatus (*CoolKeyBadCertHandler)(void *arg, PRFileDesc *fd);
 
 
 extern "C" {
@@ -112,7 +113,8 @@
 COOLKEY_API HRESULT CoolKeyUnregisterListener(CoolKeyListener* aListener);
 COOLKEY_API HRESULT CoolKeySetCallbacks(CoolKeyDispatch dispatch,
                         CoolKeyReference reference, CoolKeyRelease release,
-                        CoolKeyGetConfigValue getconfigvalue,CoolKeySetConfigValue
setconfigvalue);
+                        CoolKeyGetConfigValue getconfigvalue,CoolKeySetConfigValue
setconfigvalue,
+                        CoolKeyBadCertHandler badcerthandler=NULL);
 
 COOLKEY_API bool    CoolKeyRequiresAuthentication(const CoolKey *aKey);
 COOLKEY_API bool    CoolKeyHasApplet(const CoolKey *aKey);
@@ -259,6 +261,9 @@
 
 const char *CoolKeyGetConfig(const char *aName);
 HRESULT     CoolKeySetConfig(const char *aName,const char *aValue);
+CoolKeyBadCertHandler CoolKeyGetBadCertHandler();
+
+
 
 }
 


Index: Makefile
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/coolkey/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile	10 Jan 2007 02:21:25 -0000	1.2
+++ Makefile	19 Jun 2009 21:03:40 -0000	1.3
@@ -35,6 +35,9 @@
 	echo "Build Linux or Windows."
 	make -f common.mk
 
+export::
+	make -f common.mk export
+
 endif
 
 ifeq ($(OS_ARCH),Darwin)


Index: manifest.mn
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/coolkey/manifest.mn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- manifest.mn	23 Apr 2009 22:04:11 -0000	1.5
+++ manifest.mn	19 Jun 2009 21:03:40 -0000	1.6
@@ -19,7 +19,6 @@
 
 XULRUNNER_BASE=$(CORE_DEPTH)/dist/$(OBJDIR)//xulrunner_build
 
-
 SYS_INC		= /usr/include
 MODULE		= ckymanager
 LIBRARY_NAME	= $(MODULE)
@@ -41,7 +40,7 @@
 		SmartCardMonitoringThread.cpp \
 		$(NULL)
 
-EXPORTS 	= \
+EXPORTS		= \
 		CoolKey.h \
 		$(NULL)