[git] GnuPG - branch, STABLE-BRANCH-1-4, updated. gnupg-1.4.11-14-gfc1680a

[by David Shaw]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, STABLE-BRANCH-1-4 has been updated
       via  fc1680abdfb02f332cfec33e9ca78a4872d9be2a (commit)
      from  d0a9b8a9fb19c69620c91d531810397b7b34ea67 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fc1680abdfb02f332cfec33e9ca78a4872d9be2a
Author: David Shaw <dshaw at jabberwocky.com>
Date:   Tue Apr 5 23:47:58 2011 -0400

    * photoid.c (generate_photo_id): Check for the JPEG magic numbers
    instead of JFIF since some programs generate an EXIF header first.
    This is issue 1331.

diff --git a/g10/ChangeLog b/g10/ChangeLog
index 8479663..19db8a4 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-05  David Shaw  <dshaw at jabberwocky.com>
+
+	* photoid.c (generate_photo_id): Check for the JPEG magic numbers
+	instead of JFIF since some programs generate an EXIF header first.
+	This is issue 1331.
+
 2011-02-23  Werner Koch  <wk at g10code.com>
 
 	* Makefile.am (LDADD): Move LIBREADLINE to ..
diff --git a/g10/photoid.c b/g10/photoid.c
index 727a9ff..30c8f7f 100644
--- a/g10/photoid.c
+++ b/g10/photoid.c
@@ -1,5 +1,5 @@
 /* photoid.c - photo ID handling code
- * Copyright (C) 2001, 2002, 2005, 2006, 2008 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2005, 2006, 2008, 2011 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -139,8 +139,7 @@ generate_photo_id(PKT_public_key *pk,const char *photo_name)
       iobuf_close(file);
 
       /* Is it a JPEG? */
-      if(photo[0]!=0xFF || photo[1]!=0xD8 ||
-	 photo[6]!='J' || photo[7]!='F' || photo[8]!='I' || photo[9]!='F')
+      if(photo[0]!=0xFF || photo[1]!=0xD8)
 	{
 	  log_error(_("`%s' is not a JPEG file\n"),filename);
 	  xfree(photo);

-----------------------------------------------------------------------

Summary of changes:
 g10/ChangeLog |    6 ++++++
 g10/photoid.c |    5 ++---
 2 files changed, 8 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org