diff options
author | Casey Marshall <csm@gnu.org> | 2006-08-14 22:36:17 +0000 |
---|---|---|
committer | Casey Marshall <csm@gnu.org> | 2006-08-14 22:36:17 +0000 |
commit | 8c09ba9b0bb2b3c6768d7bf7849bf5e096efdc16 (patch) | |
tree | 2385de1ad71e083a0394a98b0865c95187cfeb76 /gnu/javax/net/ssl/provider/Finished.java | |
parent | 32bb0e9c211961fbade190535b8041ece5df772c (diff) | |
download | classpath-8c09ba9b0bb2b3c6768d7bf7849bf5e096efdc16.tar.gz |
2006-08-14 Casey Marshall <csm@gnu.org>
Merge in ssl-nio-branch work. See `ChangeLog-ssl-nio' for a record
of changes made on this branch.
Files modified:
* gnu/classpath/debug/Component.java
* gnu/classpath/debug/SystemLogger.java
* gnu/java/security/action/GetPropertyAction.java
* gnu/java/security/action/GetSecurityPropertyAction.java
* gnu/javax/crypto/RSACipherImpl.java
* gnu/javax/net/ssl/PrivateCredentials.java
* gnu/javax/net/ssl/provider/Alert.java
* gnu/javax/net/ssl/provider/AlertException.java
* gnu/javax/net/ssl/provider/Certificate.java
* gnu/javax/net/ssl/provider/CertificateRequest.java
* gnu/javax/net/ssl/provider/CertificateType.java
* gnu/javax/net/ssl/provider/CertificateVerify.java
* gnu/javax/net/ssl/provider/CipherSuite.java
* gnu/javax/net/ssl/provider/ClientHello.java
* gnu/javax/net/ssl/provider/ClientKeyExchange.java
* gnu/javax/net/ssl/provider/CompressionMethod.java
* gnu/javax/net/ssl/provider/Constructed.java
* gnu/javax/net/ssl/provider/ContentType.java
* gnu/javax/net/ssl/provider/DiffieHellman.java
* gnu/javax/net/ssl/provider/Extension.java
* gnu/javax/net/ssl/provider/Finished.java
* gnu/javax/net/ssl/provider/Handshake.java
* gnu/javax/net/ssl/provider/Jessie.java
* gnu/javax/net/ssl/provider/ProtocolVersion.java
* gnu/javax/net/ssl/provider/Random.java
* gnu/javax/net/ssl/provider/ServerHello.java
* gnu/javax/net/ssl/provider/ServerKeyExchange.java
* gnu/javax/net/ssl/provider/Signature.java
* gnu/javax/net/ssl/provider/Util.java
* gnu/javax/net/ssl/provider/X509KeyManagerFactory.java
* gnu/javax/net/ssl/provider/X509TrustManagerFactory.java
* java/security/MessageDigest.java
* java/security/MessageDigestSpi.java
* java/security/Signature.java
* java/security/SignatureSpi.java
* javax/crypto/Mac.java
* javax/crypto/MacSpi.java
* javax/net/ssl/HandshakeCompletedEvent.java
* javax/net/ssl/HttpsURLConnection.java
* javax/net/ssl/SSLContext.java
* javax/net/ssl/SSLContextSpi.java
* javax/net/ssl/SSLSession.java
Files added:
* gnu/javax/net/ssl/provider/ServerKeyExchangeBuilder.java
* gnu/javax/net/ssl/provider/SSLv3HMacSHAImpl.java
* gnu/javax/net/ssl/provider/SimpleSessionContext.java
* gnu/javax/net/ssl/provider/ServerRSAParams.java
* gnu/javax/net/ssl/provider/SSLContextImpl.java
* gnu/javax/net/ssl/provider/ServerDHParams.java
* gnu/javax/net/ssl/provider/ClientHelloBuilder.java
* gnu/javax/net/ssl/provider/ClientDHE_PSKParameters.java
* gnu/javax/net/ssl/provider/SignatureAlgorithm.java
* gnu/javax/net/ssl/provider/CipherSuiteList.java
* gnu/javax/net/ssl/provider/ServerNameList.java
* gnu/javax/net/ssl/provider/SSLServerSocketImpl.java
* gnu/javax/net/ssl/provider/CompressionMethodList.java
* gnu/javax/net/ssl/provider/ServerRSA_PSKParameters.java
* gnu/javax/net/ssl/provider/ClientKeyExchangeBuilder.java
* gnu/javax/net/ssl/provider/TrustedAuthorities.java
* gnu/javax/net/ssl/provider/CertificateStatusRequest.java
* gnu/javax/net/ssl/provider/ServerHelloDone.java
* gnu/javax/net/ssl/provider/ServerDHE_PSKParameters.java
* gnu/javax/net/ssl/provider/SSLSocketImpl.java
* gnu/javax/net/ssl/provider/ServerHelloBuilder.java
* gnu/javax/net/ssl/provider/Record.java
* gnu/javax/net/ssl/provider/SSLRSASignatureImpl.java
* gnu/javax/net/ssl/provider/EncryptedPreMasterSecret.java
* gnu/javax/net/ssl/provider/PreSharedKeyManagerFactoryImpl.java
* gnu/javax/net/ssl/provider/KeyExchangeAlgorithm.java
* gnu/javax/net/ssl/provider/SSLServerSocketFactoryImpl.java
* gnu/javax/net/ssl/provider/CertificateBuilder.java
* gnu/javax/net/ssl/provider/ClientRSA_PSKParameters.java
* gnu/javax/net/ssl/provider/CertificateStatusType.java
* gnu/javax/net/ssl/provider/ExtensionList.java
* gnu/javax/net/ssl/provider/ClientCertificateTypeList.java
* gnu/javax/net/ssl/provider/ClientPSKParameters.java
* gnu/javax/net/ssl/provider/X500PrincipalList.java
* gnu/javax/net/ssl/provider/ServerHandshake.java
* gnu/javax/net/ssl/provider/ClientDiffieHellmanPublic.java
* gnu/javax/net/ssl/provider/SessionImpl.java
* gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.java
* gnu/javax/net/ssl/provider/ServerPSKParameters.java
* gnu/javax/net/ssl/provider/TruncatedHMAC.java
* gnu/javax/net/ssl/provider/MaxFragmentLength.java
* gnu/javax/net/ssl/provider/HelloRequest.java
* gnu/javax/net/ssl/provider/ServerKeyExchangeParams.java
* gnu/javax/net/ssl/provider/UnresolvedExtensionValue.java
* gnu/javax/net/ssl/provider/CipherAlgorithm.java
* gnu/javax/net/ssl/provider/ClientHandshake.java
* gnu/javax/net/ssl/provider/ExchangeKeys.java
* gnu/javax/net/ssl/provider/CertificateURL.java
* gnu/javax/net/ssl/provider/EmptyExchangeKeys.java
* gnu/javax/net/ssl/provider/CertificateRequestBuilder.java
* gnu/javax/net/ssl/provider/SSLv3HMacMD5Impl.java
* gnu/javax/net/ssl/provider/Builder.java
* gnu/javax/net/ssl/provider/Debug.java
* gnu/javax/net/ssl/provider/SSLEngineImpl.java
* gnu/javax/net/ssl/provider/MacAlgorithm.java
* gnu/javax/net/ssl/provider/DelegatedTask.java
* gnu/javax/net/ssl/provider/InputSecurityParameters.java
* gnu/javax/net/ssl/provider/ClientHelloV2.java
* gnu/javax/net/ssl/provider/OutputSecurityParameters.java
* gnu/javax/net/ssl/provider/AbstractHandshake.java
* javax/net/ssl/SSLEngine.java
* javax/net/ssl/CertPathTrustManagerParameters.java
* javax/net/ssl/KeyStoreBuilderParameters.java
* javax/net/ssl/X509ExtendedKeyManager.java
* javax/net/ssl/SSLEngineResult.java
* gnu/javax/net/ssl/PreSharedKeyManager.java
* gnu/javax/net/ssl/Session.java
* gnu/javax/net/ssl/PreSharedKeyManagerParameters.java
* gnu/javax/net/ssl/SSLCipherSuite.java
* gnu/javax/net/ssl/AbstractSessionContext.java
* gnu/javax/net/ssl/SessionStoreException.java
* gnu/javax/net/ssl/SSLRecordHandler.java
* gnu/javax/net/ssl/SSLProtocolVersion.java
* gnu/javax/crypto/key/GnuPBEKey.java
* gnu/java/security/util/ByteBufferOutputStream.java
* gnu/java/security/Requires.java
* gnu/javax/security/auth/callback/CertificateCallback.java
Files removed:
* gnu/javax/net/ssl/provider/Context.java
* gnu/javax/net/ssl/provider/DigestInputStream.java
* gnu/javax/net/ssl/provider/DigestOutputStream.java
* gnu/javax/net/ssl/provider/Enumerated.java
* gnu/javax/net/ssl/provider/Extensions.java
* gnu/javax/net/ssl/provider/GNUSecurityParameters.java
* gnu/javax/net/ssl/provider/JCESecurityParameters.java
* gnu/javax/net/ssl/provider/JDBCSessionContext.java
* gnu/javax/net/ssl/provider/JessieDHPrivateKey.java
* gnu/javax/net/ssl/provider/JessieDHPublicKey.java
* gnu/javax/net/ssl/provider/JessieRSAPrivateKey.java
* gnu/javax/net/ssl/provider/JessieRSAPublicKey.java
* gnu/javax/net/ssl/provider/KeyPool.java
* gnu/javax/net/ssl/provider/OverflowException.java
* gnu/javax/net/ssl/provider/RecordInput.java
* gnu/javax/net/ssl/provider/RecordInputStream.java
* gnu/javax/net/ssl/provider/RecordOutputStream.java
* gnu/javax/net/ssl/provider/RecordingInputStream.java
* gnu/javax/net/ssl/provider/SSLRSASignature.java
* gnu/javax/net/ssl/provider/SSLServerSocket.java
* gnu/javax/net/ssl/provider/SSLServerSocketFactory.java
* gnu/javax/net/ssl/provider/SSLSocket.java
* gnu/javax/net/ssl/provider/SSLSocketFactory.java
* gnu/javax/net/ssl/provider/SSLSocketInputStream.java
* gnu/javax/net/ssl/provider/SSLSocketOutputStream.java
* gnu/javax/net/ssl/provider/SecurityParameters.java
* gnu/javax/net/ssl/provider/Session.java
* gnu/javax/net/ssl/provider/SessionContext.java
* gnu/javax/net/ssl/provider/SynchronizedRandom.java
* gnu/javax/net/ssl/provider/XMLSessionContext.java
Diffstat (limited to 'gnu/javax/net/ssl/provider/Finished.java')
-rw-r--r-- | gnu/javax/net/ssl/provider/Finished.java | 146 |
1 files changed, 88 insertions, 58 deletions
diff --git a/gnu/javax/net/ssl/provider/Finished.java b/gnu/javax/net/ssl/provider/Finished.java index 8b9c220a5..9a2a4707a 100644 --- a/gnu/javax/net/ssl/provider/Finished.java +++ b/gnu/javax/net/ssl/provider/Finished.java @@ -38,10 +38,10 @@ exception statement from your version. */ package gnu.javax.net.ssl.provider; -import java.io.DataInputStream; -import java.io.InputStream; -import java.io.IOException; -import java.io.OutputStream; +import java.io.PrintWriter; +import java.io.StringWriter; + +import java.nio.ByteBuffer; final class Finished implements Handshake.Body { @@ -49,95 +49,125 @@ final class Finished implements Handshake.Body // Fields. // ------------------------------------------------------------------------- - /** TLSv1.x verify data. */ - private final byte[] verifyData; - - /** SSLv3 message digest pair. */ - private final byte[] md5, sha; + private final ByteBuffer buffer; + private final ProtocolVersion version; // Constructor. // ------------------------------------------------------------------------- - Finished(byte[] verifyData) + Finished (final ByteBuffer buffer, final ProtocolVersion version) { - this.verifyData = verifyData; - md5 = sha = null; + buffer.getClass (); + version.getClass (); + this.buffer = buffer; + this.version = version; } - Finished(byte[] md5, byte[] sha) + // Instance methods. + // ------------------------------------------------------------------------- + + public int length () { - this.md5 = md5; - this.sha = sha; - verifyData = null; + if (version.compareTo(ProtocolVersion.TLS_1) >= 0) + return 12; + if (version == ProtocolVersion.SSL_3) + return 36; + throw new IllegalArgumentException ("length for this version unknown"); } - // Class methods. - // ------------------------------------------------------------------------- - - static Finished read(InputStream in, CipherSuite suite) - throws IOException + byte[] verifyData() { - DataInputStream din = new DataInputStream(in); - if (suite.getVersion().equals(ProtocolVersion.SSL_3)) + if (version.compareTo(ProtocolVersion.TLS_1) >= 0) { - byte[] md5 = new byte[16]; - byte[] sha = new byte[20]; - din.readFully(md5); - din.readFully(sha); - return new Finished(md5, sha); + byte[] verify = new byte[12]; + buffer.position (0); + buffer.get (verify); + return verify; } - else + throw new IllegalArgumentException ("not TLSv1.0 or later"); + } + + byte[] md5Hash() + { + if (version == ProtocolVersion.SSL_3) { - byte[] buf = new byte[12]; - din.readFully(buf); - return new Finished(buf); + byte[] md5 = new byte[16]; + buffer.position (0); + buffer.get (md5); + return md5; } + throw new IllegalArgumentException ("not SSLv3"); } - // Instance methods. - // ------------------------------------------------------------------------- - - public void write(OutputStream out) throws IOException + byte[] shaHash() { - if (verifyData != null) - out.write(verifyData); - else + if (version == ProtocolVersion.SSL_3) { - out.write(md5); - out.write(sha); + byte[] sha = new byte[20]; + buffer.position (16); + buffer.get (sha); + return sha; } + throw new IllegalArgumentException ("not SSLv3"); + } + + void setVerifyData (final byte[] verifyData, final int offset) + { + if (version == ProtocolVersion.SSL_3) + throw new IllegalArgumentException ("not TLSv1"); + buffer.position (0); + buffer.put (verifyData, offset, 12); } - byte[] getVerifyData() + void setMD5Hash (final byte[] md5, final int offset) { - return verifyData; + if (version != ProtocolVersion.SSL_3) + throw new IllegalArgumentException ("not SSLv3"); + buffer.position (0); + buffer.put (md5, offset, 16); } - byte[] getMD5Hash() + void setShaHash (final byte[] sha, final int offset) { - return md5; + if (version != ProtocolVersion.SSL_3) + throw new IllegalArgumentException ("not SSLv3"); + buffer.position (16); + buffer.put (sha, offset, 20); } - byte[] getSHAHash() + public String toString () { - return sha; + return toString (null); } - public String toString() + public String toString (final String prefix) { - String nl = System.getProperty("line.separator"); - if (verifyData != null) + StringWriter str = new StringWriter (); + PrintWriter out = new PrintWriter (str); + if (prefix != null) + out.print (prefix); + out.println ("struct {"); + if (prefix != null) + out.print (prefix); + if (version.compareTo(ProtocolVersion.TLS_1) >= 0) { - return "struct {" + nl + - " verifyData = " + Util.toHexString(verifyData, ':') + ";" + nl + - "} Finished;" + nl; + out.print (" verifyData = "); + out.print (Util.toHexString (verifyData (), ':')); } - else + else if (version == ProtocolVersion.SSL_3) { - return "struct {" + nl + - " md5Hash = " + Util.toHexString(md5, ':') + ";" + nl + - " shaHash = " + Util.toHexString(sha, ':') + ";" + nl + - "} Finished;" + nl; + out.print (" md5 = "); + out.print (Util.toHexString (md5Hash (), ':')); + out.println (';'); + if (prefix != null) + out.print (prefix); + out.print (" sha = "); + out.print (Util.toHexString (shaHash (), ':')); } + out.println (';'); + if (prefix != null) + out.print (prefix); + out.print ("} Finished;"); + return str.toString (); } } |