head	1.2;
access;
symbols
	pkgsrc-2015Q2:1.1.0.46
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.44
	pkgsrc-2015Q1-base:1.1
	pkgsrc-2014Q4:1.1.0.42
	pkgsrc-2014Q4-base:1.1
	pkgsrc-2014Q3:1.1.0.40
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.38
	pkgsrc-2014Q2-base:1.1
	pkgsrc-2014Q1:1.1.0.36
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.34
	pkgsrc-2013Q4-base:1.1
	pkgsrc-2013Q3:1.1.0.32
	pkgsrc-2013Q3-base:1.1
	pkgsrc-2013Q2:1.1.0.30
	pkgsrc-2013Q2-base:1.1
	pkgsrc-2013Q1:1.1.0.28
	pkgsrc-2013Q1-base:1.1
	pkgsrc-2012Q4:1.1.0.26
	pkgsrc-2012Q4-base:1.1
	pkgsrc-2012Q3:1.1.0.24
	pkgsrc-2012Q3-base:1.1
	pkgsrc-2012Q2:1.1.0.22
	pkgsrc-2012Q2-base:1.1
	pkgsrc-2012Q1:1.1.0.20
	pkgsrc-2012Q1-base:1.1
	pkgsrc-2011Q4:1.1.0.18
	pkgsrc-2011Q4-base:1.1
	pkgsrc-2011Q3:1.1.0.16
	pkgsrc-2011Q3-base:1.1
	pkgsrc-2011Q2:1.1.0.14
	pkgsrc-2011Q2-base:1.1
	pkgsrc-2011Q1:1.1.0.12
	pkgsrc-2011Q1-base:1.1
	pkgsrc-2010Q4:1.1.0.10
	pkgsrc-2010Q4-base:1.1
	pkgsrc-2010Q3:1.1.0.8
	pkgsrc-2010Q3-base:1.1
	pkgsrc-2010Q2:1.1.0.6
	pkgsrc-2010Q2-base:1.1
	pkgsrc-2010Q1:1.1.0.4
	pkgsrc-2010Q1-base:1.1
	pkgsrc-2009Q4:1.1.0.2
	pkgsrc-2009Q4-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2015.09.09.18.15.34;	author wiz;	state dead;
branches;
next	1.1;
commitid	smlOqJCrnzl4GBAy;

1.1
date	2009.12.18.17.49.51;	author drochner;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update security/gnupg2 to 2.0.29.

While here, clean up patches. They looked pretty cargo-culty to me and
were not commented.
File a bug report for one of the remaining ones and link to it from comment.

Changes in 2.0.29:

Noteworthy changes in version 2.0.29 (2015-09-08)
-------------------------------------------------

 * gpg: Print a PGP-2 fingerprint again instead of a row of "0".

 * gpg: Fixed a race condition from multiple several "gpg --verify".

 * gpg: Print FAILURE status lines to help GPGME.

 * gpgsm: Fixed a regression in CSR generation.

 * scdaemon: Fixed problems with some pinpads.

 * Fixed a few other bugs.
@
text
@$NetBSD: patch-al,v 1.1 2009/12/18 17:49:51 drochner Exp $

--- g10/seckey-cert.c.orig	2009-08-06 17:32:40.000000000 +0000
+++ g10/seckey-cert.c
@@@@ -209,6 +209,12 @@@@ do_check( PKT_secret_key *sk, const char
                 csum += checksum (buffer, ndata);
                 gcry_mpi_release (sk->skey[i]);
 
+/* http://www.kfwebs.net/articles/article/42/GnuPG-2.0---IDEA-support */
+		if (sk->protect.algo == CIPHER_ALGO_IDEA) {
+			buffer[0] = 0;
+			buffer[1] = 0;
+		}
+
 		err = gcry_mpi_scan( &sk->skey[i], GCRYMPI_FMT_PGP,
 				     buffer, ndata, &ndata );
 		xfree (buffer);
@


1.1
log
@kill the "idea" option -- gnupg2 uses libgcrypt which used to have
an "idea" option, but that was removed more than a year ago when it
got updated from 1.2 to 1.4
The patch was was used on gnupg2 in the "idea" case was just a four-line
memory initialization fix, there is no point in LICENSE restrictions
due to this, so I've pulled it in as regular patch so that it doesn't
get lost for the case someone fixes idea support in libgcrypt
(which isn't hard).
@
text
@d1 1
a1 1
$NetBSD$
@