Index: /trunk/packages/invirt-vnc-client/InvirtTrustManager.java =================================================================== --- /trunk/packages/invirt-vnc-client/InvirtTrustManager.java (revision 1335) +++ /trunk/packages/invirt-vnc-client/InvirtTrustManager.java (revision 1335) @@ -0,0 +1,122 @@ +/* + * Copyright 2006 Perry Nguyen + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import java.io.IOException; +import java.io.InputStream; +import java.security.KeyStore; +import java.security.KeyStoreException; +import java.security.NoSuchAlgorithmException; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; +import java.util.Enumeration; +import java.util.logging.Level; +import java.util.logging.Logger; + +import javax.net.ssl.TrustManager; +import javax.net.ssl.TrustManagerFactory; +import javax.net.ssl.X509TrustManager; + +public class InvirtTrustManager implements X509TrustManager { + private X509TrustManager trustManager; + private final static char[] KEY_STORE_PASSWORD = + { 'f', 'o', 'o', 'b', 'a', 'r' }; + private final static String KEY_STORE_RESOURCE = + "trust.store"; + + private KeyStore loadKeyStore() throws Exception { + InputStream in = getClass().getClassLoader().getResourceAsStream( + KEY_STORE_RESOURCE); + KeyStore ks = null; + try { + if (in == null) { + //log.severe("Unable to open KeyStore"); + throw new NullPointerException(); + } + ks = KeyStore.getInstance(KeyStore.getDefaultType()); + ks.load(in, KEY_STORE_PASSWORD); + /*if (log.isLoggable(Level.FINEST)) { + for (Enumeration aliases = ks.aliases(); + aliases.hasMoreElements();) { + String alias = aliases.nextElement(); + log.finest("ALIAS: " + alias); + } + }*/ + } catch (NoSuchAlgorithmException e) { + throwError(e); + } catch (CertificateException e) { + throwError(e); + } catch (IOException e) { + throwError(e); + } catch (KeyStoreException e) { + throwError(e); + } finally { + try { + if (in != null) + in.close(); + } + catch (IOException e) { } // ignore + } + return ks; + } + private void createTrustManager() { + try { + try { + KeyStore keystore = loadKeyStore(); + TrustManagerFactory factory = TrustManagerFactory.getInstance( + TrustManagerFactory.getDefaultAlgorithm()); + factory.init(keystore); + TrustManager[] trustManagers = factory.getTrustManagers(); + if (trustManagers.length == 0) + throw new IllegalStateException("No trust manager found"); + setTrustManager((X509TrustManager) trustManagers[0]); + } catch (NoSuchAlgorithmException e) { + throwError(e); + } catch (KeyStoreException e) { + throwError(e); + } + } catch (Exception e) { + e.printStackTrace(); + } + } + private void throwError(Exception e) throws Exception { + //HttpClientError error = new HttpClientError(e.getMessage()); + //error.initCause(e); + throw e; + } + public X509TrustManager getTrustManager() { + if (trustManager == null) + createTrustManager(); + return trustManager; + } + + public void setTrustManager(X509TrustManager trustManager) { + this.trustManager = trustManager; + } + + public void checkClientTrusted(X509Certificate[] chain, String authType) + throws CertificateException { + getTrustManager().checkClientTrusted(chain, authType); + } + + public void checkServerTrusted(X509Certificate[] chain, String authType) + throws CertificateException { + getTrustManager().checkServerTrusted(chain, authType); + + } + + public X509Certificate[] getAcceptedIssuers() { + return getTrustManager().getAcceptedIssuers(); + } + +} Index: /trunk/packages/invirt-vnc-client/Makefile =================================================================== --- /trunk/packages/invirt-vnc-client/Makefile (revision 1334) +++ /trunk/packages/invirt-vnc-client/Makefile (revision 1335) @@ -21,5 +21,5 @@ HTTPConnectSocket.class ReloginPanel.class \ InStream.class MemInStream.class ZlibInStream.class \ - VNCProxyConnectSocketWrapper.class SocketWrapper.class SocketWrapper\$$WrappingSocketImpl.class SIPBTrustManager.class + VNCProxyConnectSocketWrapper.class SocketWrapper.class SocketWrapper\$$WrappingSocketImpl.class InvirtTrustManager.class SOURCES = VncViewer.java RfbProto.java AuthPanel.java VncCanvas.java \ @@ -32,5 +32,5 @@ HTTPConnectSocket.java ReloginPanel.java \ InStream.java MemInStream.java ZlibInStream.java \ - VNCProxyConnectSocketWrapper.java SocketWrapper.java SIPBTrustManager.java + VNCProxyConnectSocketWrapper.java SocketWrapper.java InvirtTrustManager.java EXTRAJAR = trust.store Index: unk/packages/invirt-vnc-client/SIPBTrustManager.java =================================================================== --- /trunk/packages/invirt-vnc-client/SIPBTrustManager.java (revision 1334) +++ (revision ) @@ -1,122 +1,0 @@ -/* - * Copyright 2006 Perry Nguyen - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -import java.io.IOException; -import java.io.InputStream; -import java.security.KeyStore; -import java.security.KeyStoreException; -import java.security.NoSuchAlgorithmException; -import java.security.cert.CertificateException; -import java.security.cert.X509Certificate; -import java.util.Enumeration; -import java.util.logging.Level; -import java.util.logging.Logger; - -import javax.net.ssl.TrustManager; -import javax.net.ssl.TrustManagerFactory; -import javax.net.ssl.X509TrustManager; - -public class SIPBTrustManager implements X509TrustManager { - private X509TrustManager trustManager; - private final static char[] KEY_STORE_PASSWORD = - { 'f', 'o', 'o', 'b', 'a', 'r' }; - private final static String KEY_STORE_RESOURCE = - "trust.store"; - - private KeyStore loadKeyStore() throws Exception { - InputStream in = getClass().getClassLoader().getResourceAsStream( - KEY_STORE_RESOURCE); - KeyStore ks = null; - try { - if (in == null) { - //log.severe("Unable to open KeyStore"); - throw new NullPointerException(); - } - ks = KeyStore.getInstance(KeyStore.getDefaultType()); - ks.load(in, KEY_STORE_PASSWORD); - /*if (log.isLoggable(Level.FINEST)) { - for (Enumeration aliases = ks.aliases(); - aliases.hasMoreElements();) { - String alias = aliases.nextElement(); - log.finest("ALIAS: " + alias); - } - }*/ - } catch (NoSuchAlgorithmException e) { - throwError(e); - } catch (CertificateException e) { - throwError(e); - } catch (IOException e) { - throwError(e); - } catch (KeyStoreException e) { - throwError(e); - } finally { - try { - if (in != null) - in.close(); - } - catch (IOException e) { } // ignore - } - return ks; - } - private void createTrustManager() { - try { - try { - KeyStore keystore = loadKeyStore(); - TrustManagerFactory factory = TrustManagerFactory.getInstance( - TrustManagerFactory.getDefaultAlgorithm()); - factory.init(keystore); - TrustManager[] trustManagers = factory.getTrustManagers(); - if (trustManagers.length == 0) - throw new IllegalStateException("No trust manager found"); - setTrustManager((X509TrustManager) trustManagers[0]); - } catch (NoSuchAlgorithmException e) { - throwError(e); - } catch (KeyStoreException e) { - throwError(e); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - private void throwError(Exception e) throws Exception { - //HttpClientError error = new HttpClientError(e.getMessage()); - //error.initCause(e); - throw e; - } - public X509TrustManager getTrustManager() { - if (trustManager == null) - createTrustManager(); - return trustManager; - } - - public void setTrustManager(X509TrustManager trustManager) { - this.trustManager = trustManager; - } - - public void checkClientTrusted(X509Certificate[] chain, String authType) - throws CertificateException { - getTrustManager().checkClientTrusted(chain, authType); - } - - public void checkServerTrusted(X509Certificate[] chain, String authType) - throws CertificateException { - getTrustManager().checkServerTrusted(chain, authType); - - } - - public X509Certificate[] getAcceptedIssuers() { - return getTrustManager().getAcceptedIssuers(); - } - -} Index: /trunk/packages/invirt-vnc-client/VNCProxyConnectSocketFactory.java =================================================================== --- /trunk/packages/invirt-vnc-client/VNCProxyConnectSocketFactory.java (revision 1334) +++ /trunk/packages/invirt-vnc-client/VNCProxyConnectSocketFactory.java (revision 1335) @@ -38,5 +38,5 @@ SSLContext c = SSLContext.getInstance("SSL"); c.init(null, - new TrustManager[] { new SIPBTrustManager() }, + new TrustManager[] { new InvirtTrustManager() }, null); factory = Index: /trunk/packages/invirt-vnc-client/debian/changelog =================================================================== --- /trunk/packages/invirt-vnc-client/debian/changelog (revision 1334) +++ /trunk/packages/invirt-vnc-client/debian/changelog (revision 1335) @@ -2,6 +2,7 @@ * sipb-xen-vnc-client -> invirt-vnc-client + * SIPBTrustManager -> InvirtTrustManager - -- Evan Broder Sun, 26 Oct 2008 15:37:25 -0400 + -- Evan Broder Sun, 26 Oct 2008 16:05:14 -0400 sipb-xen-vnc-client (1.03) unstable; urgency=low