diff options
author | Peter Dettman <peter.dettman@bouncycastle.org> | 2013-05-20 12:49:11 +0400 |
---|---|---|
committer | Peter Dettman <peter.dettman@bouncycastle.org> | 2013-05-20 12:49:11 +0400 |
commit | 0801e4e5bd0c5472c716a568c0a51d07f0452805 (patch) | |
tree | 844c73b6d5f38ec4eae322df9a8a913d43c8a7a3 | |
parent | d1567899d6985035a8b70b793dc4802a15bfa241 (diff) |
Rename method
-rw-r--r-- | src/main/java/org/bouncycastle/crypto/tls/TlsECDHEKeyExchange.java | 7 | ||||
-rw-r--r-- | src/main/java/org/bouncycastle/crypto/tls/TlsSRPKeyExchange.java | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/main/java/org/bouncycastle/crypto/tls/TlsECDHEKeyExchange.java b/src/main/java/org/bouncycastle/crypto/tls/TlsECDHEKeyExchange.java index e26e6f0c..152e371f 100644 --- a/src/main/java/org/bouncycastle/crypto/tls/TlsECDHEKeyExchange.java +++ b/src/main/java/org/bouncycastle/crypto/tls/TlsECDHEKeyExchange.java @@ -105,7 +105,8 @@ public class TlsECDHEKeyExchange extends TlsECDHKeyExchange { byte[] sigBytes = serverCredentials.generateCertificateSignature(hash);
/*
- * TODO RFC 5246 4.7. digitally-signed element needs SignatureAndHashAlgorithm prepended from TLS 1.2
+ * TODO RFC 5246 4.7. digitally-signed element needs SignatureAndHashAlgorithm prepended
+ * from TLS 1.2
*/
TlsUtils.writeOpaque16(sigBytes, buf);
@@ -116,7 +117,7 @@ public class TlsECDHEKeyExchange extends TlsECDHKeyExchange { SecurityParameters securityParameters = context.getSecurityParameters();
- Signer signer = initSigner(tlsSigner, securityParameters);
+ Signer signer = initVerifyer(tlsSigner, securityParameters);
InputStream sigIn = new SignerInputStream(input, signer);
ECDomainParameters curve_params = TlsECCUtils.readECParameters(namedCurves, clientECPointFormats, sigIn);
@@ -160,7 +161,7 @@ public class TlsECDHEKeyExchange extends TlsECDHKeyExchange { }
}
- protected Signer initSigner(TlsSigner tlsSigner, SecurityParameters securityParameters) {
+ protected Signer initVerifyer(TlsSigner tlsSigner, SecurityParameters securityParameters) {
Signer signer = tlsSigner.createVerifyer(this.serverPublicKey);
signer.update(securityParameters.clientRandom, 0, securityParameters.clientRandom.length);
signer.update(securityParameters.serverRandom, 0, securityParameters.serverRandom.length);
diff --git a/src/main/java/org/bouncycastle/crypto/tls/TlsSRPKeyExchange.java b/src/main/java/org/bouncycastle/crypto/tls/TlsSRPKeyExchange.java index f4dee3d3..946239a3 100644 --- a/src/main/java/org/bouncycastle/crypto/tls/TlsSRPKeyExchange.java +++ b/src/main/java/org/bouncycastle/crypto/tls/TlsSRPKeyExchange.java @@ -109,7 +109,7 @@ public class TlsSRPKeyExchange extends AbstractTlsKeyExchange { Signer signer = null;
if (tlsSigner != null) {
- signer = initSigner(tlsSigner, securityParameters);
+ signer = initVerifyer(tlsSigner, securityParameters);
sigIn = new SignerInputStream(input, signer);
}
@@ -170,7 +170,7 @@ public class TlsSRPKeyExchange extends AbstractTlsKeyExchange { }
}
- protected Signer initSigner(TlsSigner tlsSigner, SecurityParameters securityParameters) {
+ protected Signer initVerifyer(TlsSigner tlsSigner, SecurityParameters securityParameters) {
Signer signer = tlsSigner.createVerifyer(this.serverPublicKey);
signer.update(securityParameters.clientRandom, 0, securityParameters.clientRandom.length);
signer.update(securityParameters.serverRandom, 0, securityParameters.serverRandom.length);
|