[svn] GnuPG - r4262 - trunk/scd

[svn author marcus]

Author: marcus
Date: 2006-09-24 01:32:44 +0200 (Sun, 24 Sep 2006)
New Revision: 4262

Modified:
   trunk/scd/ChangeLog
   trunk/scd/app-openpgp.c
Log:
2006-09-24  Marcus Brinkmann  <marcus at g10code.de>

        * app-openpgp.c (do_sign): Advance INDATA by the SHA1 resp. RMD160
        prefix length.



Modified: trunk/scd/ChangeLog
===================================================================
--- trunk/scd/ChangeLog	2006-09-22 18:15:18 UTC (rev 4261)
+++ trunk/scd/ChangeLog	2006-09-23 23:32:44 UTC (rev 4262)
@@ -1,3 +1,8 @@
+2006-09-24  Marcus Brinkmann  <marcus at g10code.de>
+
+	* app-openpgp.c (do_sign): Advance INDATA by the SHA1 resp. RMD160
+	prefix length.
+
 2006-09-14  Werner Koch  <wk at g10code.com>
 
  	Replaced all call gpg_error_from_errno(errno) by

Modified: trunk/scd/app-openpgp.c
===================================================================
--- trunk/scd/app-openpgp.c	2006-09-22 18:15:18 UTC (rev 4261)
+++ trunk/scd/app-openpgp.c	2006-09-23 23:32:44 UTC (rev 4262)
@@ -2116,10 +2116,16 @@
     ;
   else if (indatalen == (15 + 20) && hashalgo == GCRY_MD_SHA1
            && !memcmp (indata, sha1_prefix, 15))
-    ;
+    {
+      indata += 15;
+      indatalen -= 15;
+    }
   else if (indatalen == (15 + 20) && hashalgo == GCRY_MD_RMD160
            && !memcmp (indata, rmd160_prefix, 15))
-    ;
+    {
+      indata += 15;
+      indatalen -= 15;
+    }
   else
     {
       log_error (_("card does not support digest algorithm %s\n"),