Hi Marcus, On 2005.10.07 09:08, Marcus Brinkmann wrote:
Hi,it would be nice if you could keep bug-gpgme CC'ed on your reports, so we leave a footprint for the outside world.
Sorry. Mea culpa. It was an accidental ommission. I shall may sure that in the future I leave additional footprints. :-)
At Fri, 07 Oct 2005 01:27:11 +0000, "William M. Perkins" <[EMAIL PROTECTED]> wrote: > But, appears to expose another problem: > > make[3]: Entering directory `/work/gpgme-1.1.0/tests/gpgsm' > PASS: t-import > Key has unexpected number of user IDs > FAIL: t-keylist <<<<<<<<<<<<<<<<<<<<< BAD! > -----BEGIN ENCRYPTED MESSAGE----- > > Results: > > 1 of 7 tests failed > Please report to [EMAIL PROTECTED] > > I had the this same new error when I tried to compile gpgme-1.0.3 > earlier today. Yes, again, I used an older version of gpgsm, 1.9.15. Thanks for spotting this. The patch below, which is also in CVS, fixes it for me.
Well, this patch did fix the t-keylist check failure for me as well, and as a result the "make check" completes with no errors. I have attached both patches for the t-keylist and t-sig-notation "make check" problems for anyone else who may be building GPGME v1.1.0 using GnuPG v1.4.2 and GpgSM v1.9.18. I modified the t-keylist patch slightly by adding the tests directory to the header of the patch. Of course, as Marcus does say, both of these patch corrections are available in CVS.
Thank you Marcus!
2005-10-07 Brinkmann <[EMAIL PROTECTED]>
* gpgsm/t-keylist.c (main): Allow for an email address as a
second
uid.
Index: gpgsm/t-keylist.c
<<< Stuff deleted -- patches are attached. >> Bill -- William M. Perkins E-mail - [EMAIL PROTECTED] The Greenwood UNIX Systems Administration Richmond, Virginia (Linux, Solaris, AIX, HP-UX)
--- gpgme/tests/gpg/t-sig-notation.c 2005-10-01 04:06:08.000000000 +0200
+++ gpgme/tests/gpg/t-sig-notation.c 2005-10-07 01:00:02.000000000 +0200
@@ -42,8 +42,8 @@
{ "[EMAIL PROTECTED]",
"Just Squeeze Me",
GPGME_SIG_NOTATION_HUMAN_READABLE },
- { "[EMAIL PROTECTED]",
- "Right Now",
+ { "[EMAIL PROTECTED]",
+ "pgpmime",
GPGME_SIG_NOTATION_HUMAN_READABLE | GPGME_SIG_NOTATION_CRITICAL },
{ NULL,
"http://www.gnu.org/policy/";,
--- tests/gpgsm/t-keylist.c (Revision 1125)
+++ tests/gpgsm/t-keylist.c (Arbeitskopie)
@@ -44,6 +44,7 @@
char *issuer_name;
char *chain_id;
char *uid;
+ char *email;
gpgme_validity_t validity;
unsigned int key_length;
}
@@ -53,7 +54,7 @@
"CN=test cert 1,OU=Aegypten Project,O=g10 Code
GmbH,L=D\xc3\xbcsseldorf,C=DE",
"3CF405464F66ED4A7DF45BBDD1E4282E33BDB76E",
"CN=test cert 1,OU=Aegypten Project,O=g10 Code
GmbH,L=D\xc3\xbcsseldorf,C=DE",
- GPGME_VALIDITY_ULTIMATE, 1024
+ NULL, GPGME_VALIDITY_ULTIMATE, 1024
},
{ "DFA56FB5FC41E3A8921F77AD1622EEFD9152A5AD", 0, 909684190, 1009821790,
"01",
"1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
@@ -63,7 +64,7 @@
"1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
"CN=DFN Top Level Certification Authority,OU=DFN-PCA,"
"O=Deutsches Forschungsnetz,C=DE",
- GPGME_VALIDITY_NEVER, 2048
+ "<[EMAIL PROTECTED]>", GPGME_VALIDITY_NEVER, 2048
},
{ "2C8F3C356AB761CB3674835B792CDA52937F9285", 0, 973183644, 1009735200,
"15",
"1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
@@ -73,7 +74,7 @@
"1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
"CN=DFN Server Certification Authority,OU=DFN-PCA,"
"O=Deutsches Forschungsnetz,C=DE",
- GPGME_VALIDITY_UNKNOWN, 2048
+ "<[EMAIL PROTECTED]>", GPGME_VALIDITY_UNKNOWN, 2048
},
{ NULL }
};
@@ -286,7 +287,8 @@
exit (1);
}
- if (!key->uids || key->uids->next)
+ /* Be tolerant against a missing email (ie, older gpgsm versions). */
+ if (!key->uids || (key->uids->next && !keys[i].email))
{
fprintf (stderr, "Key has unexpected number of user IDs\n");
exit (1);
@@ -336,7 +338,14 @@
key->uids->uid);
exit (1);
}
+ if (key->uids->next && strcmp (key->uids->next->uid, keys[i].email))
+ {
+ fprintf (stderr, "Unexpected email in user ID: %s\n",
+ key->uids->next->uid);
+ exit (1);
+ }
+
gpgme_key_unref (key);
i++;
}
pgpnPDlTtnu7J.pgp
Description: PGP signature
_______________________________________________ Gnupg-users mailing list Gnupg-users@gnupg.org http://lists.gnupg.org/mailman/listinfo/gnupg-users
