[git] GnuPG - branch, master, updated. post-nuke-of-trailing-ws-165-ga98260c

[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, master has been updated
       via  a98260c39f1c0ccdad004784cbc9440376766082 (commit)
      from  27089564b6453deaf7b4ffe7cc5f5f290b6d892b (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 a98260c39f1c0ccdad004784cbc9440376766082
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 9045f0c..c3d2745 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