[svn] GnuPG - r4195 - trunk/keyserver

[svn author dshaw]

Author: dshaw
Date: 2006-07-17 06:11:30 +0200 (Mon, 17 Jul 2006)
New Revision: 4195

Modified:
   trunk/keyserver/ChangeLog
   trunk/keyserver/gpgkeys_hkp.c
   trunk/keyserver/gpgkeys_ldap.c
Log:
* gpgkeys_hkp.c (send_key), gpgkeys_ldap.c (send_key,
send_key_keyserver): Improved version of previous fix.  Force match on
spaces in string.


Modified: trunk/keyserver/ChangeLog
===================================================================
--- trunk/keyserver/ChangeLog	2006-07-14 16:07:01 UTC (rev 4194)
+++ trunk/keyserver/ChangeLog	2006-07-17 04:11:30 UTC (rev 4195)
@@ -1,3 +1,9 @@
+2006-07-16  David Shaw  <dshaw at jabberwocky.com>
+
+	* gpgkeys_hkp.c (send_key), gpgkeys_ldap.c (send_key,
+	send_key_keyserver): Improved version of previous fix.  Force
+	match on spaces in string.
+
 2006-07-14  David Shaw  <dshaw at jabberwocky.com>
 
 	* gpgkeys_hkp.c (send_key), gpgkeys_ldap.c (send_key,

Modified: trunk/keyserver/gpgkeys_hkp.c
===================================================================
--- trunk/keyserver/gpgkeys_hkp.c	2006-07-14 16:07:01 UTC (rev 4194)
+++ trunk/keyserver/gpgkeys_hkp.c	2006-07-17 04:11:30 UTC (rev 4195)
@@ -94,7 +94,7 @@
   /* Read and throw away input until we see the BEGIN */
 
   while(fgets(line,MAX_LINE,input)!=NULL)
-    if(sscanf(line,"KEY %16s %5s\n",keyid,state)==2
+    if(sscanf(line,"KEY%*[ ]%16s%*[ ]%5s\n",keyid,state)==2
        && strcmp(state,"BEGIN")==0)
       {
 	begin=1;
@@ -113,7 +113,7 @@
   /* Now slurp up everything until we see the END */
 
   while(fgets(line,MAX_LINE,input))
-    if(sscanf(line,"KEY %16s %3s\n",keyid,state)==2
+    if(sscanf(line,"KEY%*[ ]%16s%*[ ]%3s\n",keyid,state)==2
        && strcmp(state,"END")==0)
       {
 	end=1;

Modified: trunk/keyserver/gpgkeys_ldap.c
===================================================================
--- trunk/keyserver/gpgkeys_ldap.c	2006-07-14 16:07:01 UTC (rev 4194)
+++ trunk/keyserver/gpgkeys_ldap.c	2006-07-17 04:11:30 UTC (rev 4195)
@@ -608,7 +608,7 @@
   /* Assemble the INFO stuff into LDAP attributes */
 
   while(fgets(line,MAX_LINE,input)!=NULL)
-    if(sscanf(line,"INFO %16s %5s\n",keyid,state)==2
+    if(sscanf(line,"INFO%*[ ]%16s%*[ ]%5s\n",keyid,state)==2
        && strcmp(state,"BEGIN")==0)
       {
 	begin=1;
@@ -654,7 +654,7 @@
   /* Now parse each line until we see the END */
 
   while(fgets(line,MAX_LINE,input)!=NULL)
-    if(sscanf(line,"INFO %16s %3s\n",keyid,state)==2
+    if(sscanf(line,"INFO%*[ ]%16s%*[ ]%3s\n",keyid,state)==2
        && strcmp(state,"END")==0)
       {
 	end=1;
@@ -676,7 +676,7 @@
   /* Read and throw away stdin until we see the BEGIN */
 
   while(fgets(line,MAX_LINE,input)!=NULL)
-    if(sscanf(line,"KEY %16s %5s\n",keyid,state)==2
+    if(sscanf(line,"KEY%*[ ]%16s%*[ ]%5s\n",keyid,state)==2
        && strcmp(state,"BEGIN")==0)
       {
 	begin=1;
@@ -695,7 +695,7 @@
   /* Now slurp up everything until we see the END */
 
   while(fgets(line,MAX_LINE,input)!=NULL)
-    if(sscanf(line,"KEY %16s %3s\n",keyid,state)==2
+    if(sscanf(line,"KEY%*[ ]%16s%*[ ]%3s\n",keyid,state)==2
        && strcmp(state,"END")==0)
       {
 	end=1;
@@ -816,7 +816,7 @@
   /* Read and throw away stdin until we see the BEGIN */
 
   while(fgets(line,MAX_LINE,input)!=NULL)
-    if(sscanf(line,"KEY %16s %5s\n",keyid,state)==2
+    if(sscanf(line,"KEY%*[ ]%16s%*[ ]%5s\n",keyid,state)==2
        && strcmp(state,"BEGIN")==0)
       {
 	begin=1;
@@ -835,7 +835,7 @@
   /* Now slurp up everything until we see the END */
 
   while(fgets(line,MAX_LINE,input)!=NULL)
-    if(sscanf(line,"KEY %16s %3s\n",keyid,state)==2
+    if(sscanf(line,"KEY%*[ ]%16s%*[ ]%3s\n",keyid,state)==2
        && strcmp(state,"END")==0)
       {
 	end=1;