CVSROOT: /cvsroot/classpath Module name: classpath Branch: ssl-nio-branch Changes by: Casey Marshall <rsdio> 06/07/18 08:12:30
Modified files: . : ChangeLog-ssl-nio gnu/javax/net/ssl/provider: ClientHandshake.java ClientDHE_PSKParameters.java ServerDHE_PSKParameters.java ServerKeyExchange.java ClientRSA_PSKParameters.java CipherSuite.java ServerHandshake.java ExchangeKeys.java ClientKeyExchange.java SSLContextImpl.java SSLEngineImpl.java ServerDHParams.java gnu/javax/crypto: RSACipherImpl.java Added files: gnu/javax/net/ssl/provider: EmptyExchangeKeys.java Log message: 2006-07-18 Casey Marshall <[EMAIL PROTECTED]> * gnu/javax/net/ssl/provider/ClientHandshake.java (implHandleInput, implHandleOutput): fix PSK exchange handling. (ClientDHGen.full): new field. (ClientDHGen.implRun): run full key exchange if `full' is true. (ClientDHGen.serverKey): new method. (RSAGen.full): new field. (RSAGen.implRun): run full key exchange if `full' is true. * gnu/javax/net/ssl/provider/ClientDHE_PSKParameters.java (params): slice the buffer. * gnu/javax/net/ssl/provider/ServerDHE_PSKParameters.java (<init>): use `dhParams,' not `buffer.' (params): slice the buffer. * gnu/javax/net/ssl/provider/ServerKeyExchange.java (length): handle case where parameters or signature are null. * gnu/javax/net/ssl/provider/ClientRSA_PSKParameters.java (version): removed. (<init>): don't take version argument. (<init>): don't take version argument; take buffer argument. (secret): pass TLS_1 to EncryptedPreMasterSecret constructor. * gnu/javax/net/ssl/provider/CipherSuite.java (isResolved): new field. (<init>, <init>): set `isResolved.' (resolve): add PSK cipher suite detection. (isResolved): new method. * gnu/javax/net/ssl/provider/ServerHandshake.java (serverKey): new field. (chooseSuites): choose NONE key exchanges, too; omit unresolved cipher suites. (implHandleInput, implHandleOutput): fix PSK handling. (checkKeyExchange): update for NONE and PSK exchanges. (CertLoader.implRun): grab our private key here. (RSAKeyExchange.implRun): initialize RSA cipher with our private key. (RSA_PSKExchange.implRun): likewise. * gnu/javax/net/ssl/provider/ExchangeKeys.java (<init>): duplicate and order the buffer; handle null argument. * gnu/javax/net/ssl/provider/ClientKeyExchange.java (exchangeKeys): handle NONE exchange. * gnu/javax/net/ssl/provider/SSLContextImpl.java (engineInit): handle PSK key managers properly. * gnu/javax/net/ssl/provider/SSLEngineImpl.java (<init>): remove debug logging. * gnu/javax/net/ssl/provider/ServerDHParams.java (<init>): duplicate and order the buffer. * gnu/javax/crypto/RSACipherImpl.java (doFinal): allow short input. (rsaDecrypt): ensure there's a leading zero. * gnu/javax/net/ssl/provider/EmptyExchangeKeys.java: new file. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog-ssl-nio?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.2.19&r2=1.1.2.20 http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/ClientHandshake.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.2.2&r2=1.1.2.3 http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/ClientDHE_PSKParameters.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.2.1&r2=1.1.2.2 http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/ServerDHE_PSKParameters.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.2.1&r2=1.1.2.2 http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/ServerKeyExchange.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.4.1.2.3&r2=1.1.4.1.2.4 http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/ClientRSA_PSKParameters.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.2.1&r2=1.1.2.2 http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/CipherSuite.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.4.1.2.4&r2=1.1.4.1.2.5 http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/ServerHandshake.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.2.6&r2=1.1.2.7 http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/ExchangeKeys.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.4.2&r2=1.1.4.3 http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/ClientKeyExchange.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.4.1.2.4&r2=1.1.4.1.2.5 http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/SSLContextImpl.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.2.4&r2=1.1.2.5 http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/SSLEngineImpl.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.2.5&r2=1.1.2.6 http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/ServerDHParams.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.4.4&r2=1.1.4.5 http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/net/ssl/provider/EmptyExchangeKeys.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&rev=1.1.2.1 http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/javax/crypto/RSACipherImpl.java?cvsroot=classpath&only_with_tag=ssl-nio-branch&r1=1.1.2.2.2.1&r2=1.1.2.2.2.2