[git] GnuPG - branch, STABLE-BRANCH-2-0, updated. gnupg-2.0.18-5-g5a0ed4a

[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-2-0 has been updated
       via  5a0ed4a2cc809b8595c8907e91649987775731d2 (commit)
      from  28c6cef128219ffdf548d6f5acf819aa2303fe0d (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 5a0ed4a2cc809b8595c8907e91649987775731d2
Author: David Shaw <dshaw at jabberwocky.com>
Date:   Thu Dec 15 16:46:28 2011 -0500

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

diff --git a/g10/photoid.c b/g10/photoid.c
index 8aa4ad4..37156f2 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.
  *
@@ -141,8 +141,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/photoid.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)


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