From 00bc8ac768b751d97e7afc723d38d8595c6ac28b Mon Sep 17 00:00:00 2001 From: akwizgran Date: Fri, 19 Apr 2019 13:34:15 +0100 Subject: [PATCH] Include handshake keys when loading all local authors. --- .../java/org/briarproject/bramble/db/JdbcDatabase.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/bramble-core/src/main/java/org/briarproject/bramble/db/JdbcDatabase.java b/bramble-core/src/main/java/org/briarproject/bramble/db/JdbcDatabase.java index 2f755838c..020805c59 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/db/JdbcDatabase.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/db/JdbcDatabase.java @@ -1782,7 +1782,8 @@ abstract class JdbcDatabase implements Database { ResultSet rs = null; try { String sql = "SELECT authorId, formatVersion, name, publicKey," - + " privateKey, created" + + " privateKey, handshakePublicKey, handshakePrivateKey," + + " created" + " FROM localAuthors"; ps = txn.prepareStatement(sql); rs = ps.executeQuery(); @@ -1793,9 +1794,12 @@ abstract class JdbcDatabase implements Database { String name = rs.getString(3); byte[] publicKey = rs.getBytes(4); byte[] privateKey = rs.getBytes(5); - long created = rs.getLong(6); + byte[] handshakePublicKey = rs.getBytes(6); + byte[] handshakePrivateKey = rs.getBytes(7); + long created = rs.getLong(8); authors.add(new LocalAuthor(authorId, formatVersion, name, - publicKey, privateKey, created)); + publicKey, privateKey, handshakePublicKey, + handshakePrivateKey, created)); } rs.close(); ps.close();