New Upstream Release - pgpdump
Ready changes
Summary
Merged new upstream version: 0.35 (was: 0.34).
Resulting package
Built on 2022-05-11T10:08 (took 3m32s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-releases pgpdump-dbgsymapt install -t fresh-releases pgpdump
Lintian Result
Diff
diff --git a/CHANGES b/CHANGES
index 646c5c9..7a1aaa4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,10 @@
Change Log
+0.35 2022/02/28
+
+* Adding BrainPool-384/512 curve definitions.
+ https://github.com/kazu-yamamoto/pgpdump/pull/33
+
0.34 2021/12/07
* Uploading modifications to support GnuPG-2.3.3 ECC curves, additional hash and algorithm names.
diff --git a/debian/changelog b/debian/changelog
index 4ca3442..eca5a89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pgpdump (0.35-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Debian Janitor <janitor@jelmer.uk> Wed, 11 May 2022 10:04:57 -0000
+
pgpdump (0.34-1) unstable; urgency=medium
[ Debian Janitor ]
diff --git a/keys.c b/keys.c
index c98af8b..e3dda96 100644
--- a/keys.c
+++ b/keys.c
@@ -54,13 +54,15 @@ old_Public_Key_Packet(void)
multi_precision_integer("RSA e");
}
-/* added: 2021-11-11
+/* added: 2021-11-11; extended: 2022-02-21 (BrainPool 384,512; RFC5639)
* Reference: draft-ietf-openpgp-crypto-refresh-04 (10/2021);section 9.2 ECC Curves for OpenPGP
* https://www.ietf.org/archive/id/draft-ietf-openpgp-crypto-refresh-04.html
* Note (2021-11-25): actual ECC curve hex OID padded to 10 to match incoming oid array length
* so that memcmp will work properly (compare two values of the same size)
*/
private unsigned char BrainPool256r1_OID[10]={0x2B,0x24,0x3,0x3,0x2,0x8,0x1,0x1,0x7,0};
+private unsigned char BrainPool384r1_OID[10]={0x2B,0x24,0x3,0x3,0x2,0x8,0x1,0x1,0x0b,0};
+private unsigned char BrainPool512r1_OID[10]={0x2B,0x24,0x3,0x3,0x2,0x8,0x1,0x1,0x0d,0};
private unsigned char NIST_P256_OID[10]={0x2A,0x86,0x48,0xCE,0x3D,0x3,0x1,0x7,0,0};
private unsigned char NIST_P384_OID[10]={0x2B,0x81,0x04,0x00,0x22,0,0,0,0,0};
private unsigned char NIST_P521_OID[10]={0x2B,0x81,0x04,0x00,0x23,0,0,0,0,0};
@@ -79,18 +81,19 @@ private struct {
const unsigned char *oidhex;
const char *name;
const char *oidstring;
- const int expectedBits;
} ELLIP_CURVES[] = {
- {NIST_P256_OID,"NIST P-256","0x2A 86 48 CE 3D 03 01 07",515},
- {NIST_P384_OID,"NIST P-384","0x2B 81 04 00 22",771},
- {NIST_P521_OID,"NIST P-521","0x2B 81 04 00 23",1059},
- {Ed25519_OID,"Ed25519","0x2B 06 01 04 01 DA 47 0F 01",263},
- {Ed448_OID,"Ed448","0x2B 65 71",463},
- {Curve25519_OID,"Curve25519","0x2B 06 01 04 01 97 55 01 05 01",263},
- {X448_OID,"X448","0x2B 65 6F",445},
- {BrainPool256r1_OID,"brainpoolP256r1","0x2B 24 03 03 02 08 01 01 07",515}
+ {NIST_P256_OID,"NIST P-256","0x2A 86 48 CE 3D 03 01 07"},
+ {NIST_P384_OID,"NIST P-384","0x2B 81 04 00 22"},
+ {NIST_P521_OID,"NIST P-521","0x2B 81 04 00 23"},
+ {Ed25519_OID,"Ed25519","0x2B 06 01 04 01 DA 47 0F 01"},
+ {Ed448_OID,"Ed448","0x2B 65 71"},
+ {Curve25519_OID,"Curve25519","0x2B 06 01 04 01 97 55 01 05 01"},
+ {X448_OID,"X448","0x2B 65 6F"},
+ {BrainPool256r1_OID,"brainpoolP256r1","0x2B 24 03 03 02 08 01 01 07"},
+ {BrainPool384r1_OID,"BrainPoolP384r1","0x2B 24 03 03 02 08 01 01 07 0b"},
+ {BrainPool512r1_OID,"BrainPoolP512r1","0x2B 24 03 03 02 08 01 01 07 0d"}
};
-#define ELLIP_CURVES_NUM 8
+#define ELLIP_CURVES_NUM 10
/* end 2021-11-11 */
diff --git a/pgpdump.c b/pgpdump.c
index f003f13..70cefd8 100644
--- a/pgpdump.c
+++ b/pgpdump.c
@@ -14,7 +14,7 @@ int mflag;
int pflag;
int uflag;
-private string pgpdump_version = "0.34, Copyright (C) 1998-2021 Kazu Yamamoto";
+private string pgpdump_version = "0.35, Copyright (C) 1998-2022 Kazu Yamamoto";
private string prog;
private string getprog(void);
Debdiff
[The following lists of changes regard files as different if they have different names, permissions or owners.]
Files in second set of .debs but not in first
-rw-r--r-- root/root /usr/lib/debug/.build-id/cc/d61de7b62872fac2fc6496a3bfbaf1c082a42c.debug
Files in first set of .debs but not in second
-rw-r--r-- root/root /usr/lib/debug/.build-id/11/a41385e4db792d23abc44f275b0eed44fe6587.debug
Control files of package pgpdump: lines which differ (wdiff format)
Depends: libbz2-1.0, libc6 (>= 2.34), 2.4), zlib1g (>= 1:1.1.4)
Control files of package pgpdump-dbgsym: lines which differ (wdiff format)
Build-Ids: 11a41385e4db792d23abc44f275b0eed44fe6587 ccd61de7b62872fac2fc6496a3bfbaf1c082a42c