From 3a20dee36f687b5bd89448070fcda73a1cfd377f Mon Sep 17 00:00:00 2001 From: Arnaud Fontaine Date: Wed, 4 Jan 2017 15:44:24 +0100 Subject: [PATCH] Remove underscore in variable names --- .../securitytoken/SCP11bSecureMessaging.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SCP11bSecureMessaging.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SCP11bSecureMessaging.java index ba3ec12d9..623eb504d 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SCP11bSecureMessaging.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SCP11bSecureMessaging.java @@ -170,11 +170,11 @@ class SCP11bSecureMessaging implements SecureMessaging { private static final ECParameterSpec getAlgorithmParameterSpec(final ECKeyFormat kf) throws NoSuchProviderException, NoSuchAlgorithmException, InvalidParameterSpecException { - final AlgorithmParameters algo_params = AlgorithmParameters.getInstance(SCP11B_KEY_AGREEMENT_KEY_ALGO, PROVIDER); + final AlgorithmParameters algoParams = AlgorithmParameters.getInstance(SCP11B_KEY_AGREEMENT_KEY_ALGO, PROVIDER); - algo_params.init(new ECGenParameterSpec(ECNamedCurveTable.getName(kf.getCurveOID()))); + algoParams.init(new ECGenParameterSpec(ECNamedCurveTable.getName(kf.getCurveOID()))); - return algo_params.getParameterSpec(ECParameterSpec.class); + return algoParams.getParameterSpec(ECParameterSpec.class); } @@ -228,17 +228,17 @@ class SCP11bSecureMessaging implements SecureMessaging { final ECParameterSpec kfParams = getAlgorithmParameterSpec(kf); - final Certificate _cardCert = certFactory.generateCertificate(new ByteArrayInputStream(data)); - if (!(_cardCert instanceof X509Certificate)) { + final Certificate cert = certFactory.generateCertificate(new ByteArrayInputStream(data)); + if (!(cert instanceof X509Certificate)) { throw new IOException("invalid card certificate"); } - final X509Certificate cardCert = (X509Certificate) _cardCert; + final X509Certificate cardCert = (X509Certificate) cert; - final PublicKey _cardPk = cardCert.getPublicKey(); - if (!(_cardPk instanceof ECPublicKey)) { + final PublicKey pk = cardCert.getPublicKey(); + if (!(pk instanceof ECPublicKey)) { throw new IOException("invalid card public key"); } - final ECPublicKey cardPk = (ECPublicKey) _cardPk; + final ECPublicKey cardPk = (ECPublicKey) pk; final ECParameterSpec cardPkParams = cardPk.getParams(); if (!kfParams.getCurve().equals(cardPkParams.getCurve())) {