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/Random.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/Random.java')
-rw-r--r-- | gnu/javax/net/ssl/provider/Random.java | 112 |
1 files changed, 71 insertions, 41 deletions
diff --git a/gnu/javax/net/ssl/provider/Random.java b/gnu/javax/net/ssl/provider/Random.java index c42592b14..e68159309 100644 --- a/gnu/javax/net/ssl/provider/Random.java +++ b/gnu/javax/net/ssl/provider/Random.java @@ -45,80 +45,110 @@ import java.io.OutputStream; import java.io.PrintWriter; import java.io.StringWriter; -class Random implements Constructed +import java.nio.ByteBuffer; +import java.nio.ByteOrder; + +/** + * An SSL nonce. + * + * <pre> +struct +{ + uint32 gmt_unix_time; + opaque random_bytes[28]; +} Random; + */ +public class Random implements Builder, Constructed { // Fields. // ------------------------------------------------------------------------- - private final int gmtUnixTime; - private final byte[] randomBytes; + static final int RANDOM_LENGTH = 28; + + private final ByteBuffer buffer; // Constructors. // ------------------------------------------------------------------------- - Random(int gmtUnixTime, byte[] randomBytes) + public Random (final ByteBuffer buffer) { - this.gmtUnixTime = gmtUnixTime; - this.randomBytes = (byte[]) randomBytes.clone(); + this.buffer = buffer.duplicate().order(ByteOrder.BIG_ENDIAN); } - // Class methods. - // ------------------------------------------------------------------------- + public Random copy() + { + ByteBuffer buffer = ByteBuffer.allocate(32); + buffer.put((ByteBuffer) this.buffer.duplicate().position(0)); + return new Random(buffer); + } - static Random read(InputStream in) throws IOException + public int length() { - int time = (in.read() & 0xFF) << 24 | (in.read() & 0xFF) << 16 - | (in.read() & 0xFF) << 8 | (in.read() & 0xFF); - byte[] buf = new byte[28]; - in.read(buf); - return new Random(time, buf); + return RANDOM_LENGTH + 4; + } + + public ByteBuffer buffer() + { + return ((ByteBuffer) buffer.duplicate().position(0).limit(length())).slice(); } - // Instance methods. - // ------------------------------------------------------------------------- + public int gmtUnixTime () + { + return buffer.getInt(0); + } - public void write(OutputStream out) throws IOException + public byte[] randomBytes() { - out.write((gmtUnixTime >>> 24) & 0xFF); - out.write((gmtUnixTime >>> 16) & 0xFF); - out.write((gmtUnixTime >>> 8) & 0xFF); - out.write(gmtUnixTime & 0xFF); - out.write(randomBytes); + byte[] buf = new byte[28]; + buffer.position (4); + buffer.get (buf); + return buf; } - byte[] getEncoded() + public void setGmtUnixTime (final int gmtUnixTime) { - ByteArrayOutputStream bout = new ByteArrayOutputStream(32); - try - { - write(bout); - } - catch (IOException cantHappen) - { - throw new Error(cantHappen.toString()); - } - return bout.toByteArray(); + buffer.putInt (0, gmtUnixTime); } - int getTime() + public void setRandomBytes (final byte[] randomBytes) { - return gmtUnixTime; + setRandomBytes (randomBytes, 0); } - byte[] getRandomBytes() + public void setRandomBytes (final byte[] randomBytes, final int offset) { - return randomBytes; + if (randomBytes.length - offset < RANDOM_LENGTH) + throw new IllegalArgumentException ("random value too short"); + buffer.position (4); + buffer.put (randomBytes, offset, RANDOM_LENGTH); } - public String toString() + public String toString (final String prefix) { StringWriter str = new StringWriter(); PrintWriter out = new PrintWriter(str); + if (prefix != null) + out.print (prefix); out.println("struct {"); - out.println(" gmt_unix_time = " + gmtUnixTime + ";"); - out.println(" random_bytes = " + Util.toHexString(randomBytes, ':') + ";"); - out.println("} Random;"); + if (prefix != null) + out.print (prefix); + out.print (" gmt_unix_time: "); + out.print (gmtUnixTime ()); + out.println (";"); + if (prefix != null) + out.print (prefix); + out.print (" random_bytes: "); + out.print (Util.toHexString (randomBytes (), ':')); + out.println (";"); + if (prefix != null) + out.print (prefix); + out.print ("} Random;"); return str.toString(); } + + public String toString () + { + return toString (null); + } } |