Merge branch 'master' into Development

This commit is contained in:
Manfred Karrer 2017-10-12 14:24:10 -05:00
commit 2cbe7454aa
No known key found for this signature in database
GPG key ID: 401250966A6B2C46

View file

@ -173,7 +173,7 @@ public class ArbitratorManager {
.filter(e -> { .filter(e -> {
final boolean isInPublicKeyInList = isPublicKeyInList(Utils.HEX.encode(e.getRegistrationPubKey())); final boolean isInPublicKeyInList = isPublicKeyInList(Utils.HEX.encode(e.getRegistrationPubKey()));
if (!isInPublicKeyInList) if (!isInPublicKeyInList)
log.warn("We got an arbitrator which is not in our list of publicKeys. Arbitrator=", e.toString()); log.warn("We got an arbitrator which is not in our list of publicKeys. Arbitrator={}", e.toString());
final boolean isSigValid = verifySignature(e.getPubKeyRing().getSignaturePubKey(), final boolean isSigValid = verifySignature(e.getPubKeyRing().getSignaturePubKey(),
e.getRegistrationPubKey(), e.getRegistrationPubKey(),
e.getRegistrationSignature()); e.getRegistrationSignature());