diff options
author | Peter Dettman <peter.dettman@bouncycastle.org> | 2013-12-17 14:15:28 +0400 |
---|---|---|
committer | Peter Dettman <peter.dettman@bouncycastle.org> | 2013-12-17 14:15:28 +0400 |
commit | 448763c9873ff03f1c224b00423ddc5dc02915d7 (patch) | |
tree | 028350b41658434a02629232cbc6dd4b11da742c /core/src/main/java/org/bouncycastle/crypto/tls | |
parent | d6233adf55f4fe86111b5155ebeef5a30b7a7f4c (diff) |
A few small cleanups
Diffstat (limited to 'core/src/main/java/org/bouncycastle/crypto/tls')
4 files changed, 4 insertions, 9 deletions
diff --git a/core/src/main/java/org/bouncycastle/crypto/tls/AlertLevel.java b/core/src/main/java/org/bouncycastle/crypto/tls/AlertLevel.java index b0b131d6..53e843a4 100644 --- a/core/src/main/java/org/bouncycastle/crypto/tls/AlertLevel.java +++ b/core/src/main/java/org/bouncycastle/crypto/tls/AlertLevel.java @@ -1,7 +1,7 @@ package org.bouncycastle.crypto.tls; /** - * RFC 2246 7.2 + * RFC 5246 7.2 */ public class AlertLevel { diff --git a/core/src/main/java/org/bouncycastle/crypto/tls/CertificateRequest.java b/core/src/main/java/org/bouncycastle/crypto/tls/CertificateRequest.java index e9606e3f..b76e50a3 100644 --- a/core/src/main/java/org/bouncycastle/crypto/tls/CertificateRequest.java +++ b/core/src/main/java/org/bouncycastle/crypto/tls/CertificateRequest.java @@ -29,11 +29,6 @@ public class CertificateRequest protected Vector supportedSignatureAlgorithms; protected Vector certificateAuthorities; - /* - * TODO RFC 5264 7.4.4 A list of the hash/signature algorithm pairs that the server is able to - * verify, listed in descending order of preference. - */ - /** * @param certificateTypes see {@link ClientCertificateType} for valid constants. * @param certificateAuthorities a {@link Vector} of {@link X500Name}. diff --git a/core/src/main/java/org/bouncycastle/crypto/tls/SignatureAndHashAlgorithm.java b/core/src/main/java/org/bouncycastle/crypto/tls/SignatureAndHashAlgorithm.java index a5a591ee..9404a72f 100644 --- a/core/src/main/java/org/bouncycastle/crypto/tls/SignatureAndHashAlgorithm.java +++ b/core/src/main/java/org/bouncycastle/crypto/tls/SignatureAndHashAlgorithm.java @@ -75,8 +75,8 @@ public class SignatureAndHashAlgorithm public void encode(OutputStream output) throws IOException { - TlsUtils.writeUint8(hash, output); - TlsUtils.writeUint8(signature, output); + TlsUtils.writeUint8(getHash(), output); + TlsUtils.writeUint8(getSignature(), output); } /** diff --git a/core/src/main/java/org/bouncycastle/crypto/tls/TlsUtils.java b/core/src/main/java/org/bouncycastle/crypto/tls/TlsUtils.java index 7e09f41d..f1c7194d 100644 --- a/core/src/main/java/org/bouncycastle/crypto/tls/TlsUtils.java +++ b/core/src/main/java/org/bouncycastle/crypto/tls/TlsUtils.java @@ -43,7 +43,7 @@ import org.bouncycastle.util.io.Streams; */ public class TlsUtils { - public static byte[] EMPTY_BYTES = new byte[0]; + public static final byte[] EMPTY_BYTES = new byte[0]; public static final Integer EXT_signature_algorithms = Integers.valueOf(ExtensionType.signature_algorithms); |