From 795dbf0342c245362eed5547e17fef923d763054 Mon Sep 17 00:00:00 2001
From: vtarasov <vtarasov@c6295689-39f2-0310-b995-f0e70906c6a9>
Date: Sun, 12 Dec 2010 10:30:07 +0000
Subject: [PATCH] win32: change path to the OpenSC registry keys

Now it begins with "SOFTWARE\\OpenSC Project\\..." .


git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4940 c6295689-39f2-0310-b995-f0e70906c6a9
---
 src/cardmod/cardmod.c       | 4 ++--
 src/libopensc/reader-pcsc.c | 2 +-
 src/pkcs11/pkcs11-spy.c     | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/cardmod/cardmod.c b/src/cardmod/cardmod.c
index 46621b20..ad09e797 100644
--- a/src/cardmod/cardmod.c
+++ b/src/cardmod/cardmod.c
@@ -1414,7 +1414,7 @@ DWORD WINAPI CardAcquireContext(IN PCARD_DATA pCardData, __in DWORD dwFlags)
 		ctx_param.ver = 1;
 		ctx_param.app_name = "cardmod";
 
-		if (RegCreateKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Opensc", 0, NULL, \
+		if (RegCreateKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\OpenSC Project\\Opensc", 0, NULL, \
 			REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &key, NULL) == ERROR_SUCCESS)
 		{
 			if(RegSetValueEx(key, "pcsc_ctx", NULL, REG_DWORD, &(pCardData->hSCardCtx), \
@@ -1664,7 +1664,7 @@ BOOL APIENTRY DllMain( HMODULE hModule,
 				while (isalnum(*p) || ('.' == *p) || ('_' == *p)) p--;
 				p++;
 				
-				if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Opensc",\
+				if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\OpenSC Project\\Opensc",\
 					NULL, KEY_READ, &key)==ERROR_SUCCESS)
 				{
 					CHAR val[1024]; 
diff --git a/src/libopensc/reader-pcsc.c b/src/libopensc/reader-pcsc.c
index 9569f535..bdb77d82 100644
--- a/src/libopensc/reader-pcsc.c
+++ b/src/libopensc/reader-pcsc.c
@@ -1674,7 +1674,7 @@ static int cardmod_detect_readers(sc_context_t *ctx)
 
 	sc_debug(ctx, SC_LOG_DEBUG_NORMAL, "Probing pcsc readers");
 
-	if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Opensc",\
+	if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\OpenSC Project\\Opensc",\
 		NULL, KEY_READ, &key)==ERROR_SUCCESS)
 	{
 		CHAR val[1024]; 
diff --git a/src/pkcs11/pkcs11-spy.c b/src/pkcs11/pkcs11-spy.c
index 0411584b..ba9a2c13 100644
--- a/src/pkcs11/pkcs11-spy.c
+++ b/src/pkcs11/pkcs11-spy.c
@@ -151,10 +151,10 @@ static CK_RV init_spy(void)
 		/* try for the machine version first, as we may be runing 
 	     * without a user during login 
 		 */
-        rc = RegOpenKeyEx( HKEY_LOCAL_MACHINE, "Software\\PKCS11-Spy",
+        rc = RegOpenKeyEx( HKEY_LOCAL_MACHINE, "Software\\OpenSC Project\\PKCS11-Spy",
                 0, KEY_QUERY_VALUE, &hKey );
 		if (rc != ERROR_SUCCESS ) {
-        	rc = RegOpenKeyEx( HKEY_CURRENT_USER, "Software\\PKCS11-Spy",
+        	rc = RegOpenKeyEx( HKEY_CURRENT_USER, "Software\\OpenSC Project\\PKCS11-Spy",
                 	0, KEY_QUERY_VALUE, &hKey );
 		}
         if( rc == ERROR_SUCCESS ) {
@@ -179,10 +179,10 @@ static CK_RV init_spy(void)
 		/* try for the machine version first, as we may be runing
 		 * without a user during login 
 		 */
-        rc = RegOpenKeyEx( HKEY_LOCAL_MACHINE, "Software\\PKCS11-Spy",
+        rc = RegOpenKeyEx( HKEY_LOCAL_MACHINE, "Software\\OpenSC Project\\PKCS11-Spy",
                 0, KEY_QUERY_VALUE, &hKey );
 		if (rc != ERROR_SUCCESS ) {
-        	rc = RegOpenKeyEx( HKEY_CURRENT_USER, "Software\\PKCS11-Spy",
+        	rc = RegOpenKeyEx( HKEY_CURRENT_USER, "Software\\OpenSC Project\\PKCS11-Spy",
            	     0, KEY_QUERY_VALUE, &hKey );
 		}
         if( rc == ERROR_SUCCESS ) {