From 2a6774b2218ab32883f77888a8782fc288ca2f5a Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Thu, 11 Sep 2014 22:45:35 +0200 Subject: merge: add support for s2k dummy generation if a public key gets merged into a secret one, and there are new subkeys, the merge() routine now adds a newly generated, stripped secret subkey instead. --- extern/spongycastle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'extern/spongycastle') diff --git a/extern/spongycastle b/extern/spongycastle index 526d23382..375084d55 160000 --- a/extern/spongycastle +++ b/extern/spongycastle @@ -1 +1 @@ -Subproject commit 526d23382e53ce46a17a5efd9c23d884125e32ce +Subproject commit 375084d55341b575274e49d9a69fa4cf9356682a -- cgit v1.2.3