From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Mon, 30 Jan 2012 21:04:37 +0000 (+0100)
Subject: Correct export of openpgp packets that have no private keying material in it's primar... 
X-Git-Tag: gnutls_3_0_13~142
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0c081da36e6bd14daf2e9471a330678e32cdf3ce;p=thirdparty%2Fgnutls.git

Correct export of openpgp packets that have no private keying material in it's primary key.
Patch by Sean Buckheister.
---

diff --git a/lib/opencdk/write-packet.c b/lib/opencdk/write-packet.c
index 9fb9de9625..d698af4ccc 100644
--- a/lib/opencdk/write-packet.c
+++ b/lib/opencdk/write-packet.c
@@ -487,6 +487,9 @@ calc_s2ksize (cdk_pkt_seckey_t sk)
     case CDK_S2K_ITERSALTED:
       nbytes = 11;
       break;
+	case CDK_S2K_GNU_EXT:
+	  nbytes = 2;
+	  break;
     }
   nbytes += sk->protect.ivlen;
   nbytes++;                     /* single cipher byte */