diff options
author | Ashley Hughes <spirit.returned@gmail.com> | 2014-01-30 11:35:55 +0000 |
---|---|---|
committer | Ashley Hughes <spirit.returned@gmail.com> | 2014-01-30 11:35:55 +0000 |
commit | 4119757699083889c8288960c7581a3060bd60c1 (patch) | |
tree | a5f665065feafaa40511d4f7641fc2f6cdea473c /OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util | |
parent | 358ab7d7e44314acc4659809e6f7a3e8b78b532b (diff) | |
download | open-keychain-4119757699083889c8288960c7581a3060bd60c1.tar.gz open-keychain-4119757699083889c8288960c7581a3060bd60c1.tar.bz2 open-keychain-4119757699083889c8288960c7581a3060bd60c1.zip |
bouncycastle uses the Date class, based off of UTC. Force all GregorianCalendars to use UTC, so get and set of key dates works as expected
Diffstat (limited to 'OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util')
-rw-r--r-- | OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java index 8b5e94858..fdcaf9258 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java @@ -29,6 +29,7 @@ import java.net.UnknownHostException; import java.util.ArrayList; import java.util.GregorianCalendar; import java.util.List; +import java.util.TimeZone; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -182,8 +183,11 @@ public class HkpKeyServer extends KeyServer { info.keyId = PgpKeyHelper.convertHexToKeyId(matcher.group(3)); info.fingerPrint = PgpKeyHelper.convertKeyIdToHex(info.keyId); String chunks[] = matcher.group(4).split("-"); - info.date = new GregorianCalendar(Integer.parseInt(chunks[0]), - Integer.parseInt(chunks[1]), Integer.parseInt(chunks[2])).getTime(); + + GregorianCalendar tmpGreg = new GregorianCalendar(TimeZone.getTimeZone("UTC")); + tmpGreg.set(Integer.parseInt(chunks[0]), Integer.parseInt(chunks[1]), + Integer.parseInt(chunks[2])); + info.date = tmpGreg.getTime(); info.userIds = new ArrayList<String>(); if (matcher.group(5).startsWith("*** KEY")) { info.revoked = matcher.group(5); |