switch to AIR 30 so we can use TLSSocket against TLS1.2. Replace the as3crypto TLSSocket with our own that uses AIR 30 SecureSocket
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/e09e191b Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/e09e191b Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/e09e191b Branch: refs/heads/develop Commit: e09e191bfff548a469108142940c1081a5755892 Parents: 118668a Author: Alex Harui <[email protected]> Authored: Thu Jun 14 15:31:47 2018 -0700 Committer: Alex Harui <[email protected]> Committed: Thu Jun 14 15:32:49 2018 -0700 ---------------------------------------------------------------------- flex-installer/binary_license/LICENSE | 3 +- .../src/com/hurlant/crypto/tls/TLSSocket.as | 50 ++++++++++++++++++++ .../common/src/com/hurlant/util/Base64.as | 37 +++++++++++++++ .../installer/src/InstallApacheFlex-app.xml | 2 +- 4 files changed, 90 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/e09e191b/flex-installer/binary_license/LICENSE ---------------------------------------------------------------------- diff --git a/flex-installer/binary_license/LICENSE b/flex-installer/binary_license/LICENSE index f1c6c55..0222110 100644 --- a/flex-installer/binary_license/LICENSE +++ b/flex-installer/binary_license/LICENSE @@ -225,7 +225,8 @@ as3httpclientlib bundles as3corelib, which is available under a â3-clause BSDâ license. For details, see deps/as3corelib/. as3httpclientlib bundles as3crypto, which is available under a -â3-clause BSDâ license. For details, see deps/as3httpclientlib/. +â3-clause BSDâ license. But the as3crypto classes used have been replaced +by AIR runtime and Apache Flex implementations The Open-Sans font is available under Apache License 2.0. For details see common/src/assets/fonts/open-sans/ http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/e09e191b/flex-installer/common/src/com/hurlant/crypto/tls/TLSSocket.as ---------------------------------------------------------------------- diff --git a/flex-installer/common/src/com/hurlant/crypto/tls/TLSSocket.as b/flex-installer/common/src/com/hurlant/crypto/tls/TLSSocket.as new file mode 100644 index 0000000..5b9fbc8 --- /dev/null +++ b/flex-installer/common/src/com/hurlant/crypto/tls/TLSSocket.as @@ -0,0 +1,50 @@ +/** + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You 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. + + */ +/* + * This is a SecureSocket-based replacement of the original, which was + * Copyright (c) 2007 Henri Torgemane + * Licensed under the BSD-3-Clause. + */ +package com.hurlant.crypto.tls { + + import flash.net.SecureSocket; + import flash.net.Socket; + + /** + * Map SecureSocket to replace com.hurlant.crypto.tls.TLSSocket + * + * That's all. + * + */ + public class TLSSocket extends SecureSocket{ + + public function TLSSocket(host:String = null, port:int = 0) { + super(); + if (host) + connect(host, port); + } + + + public function startTLS(socket:Socket, host:String):void { + throw new Error("STARTTLS called."); + } + + + } +} + http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/e09e191b/flex-installer/common/src/com/hurlant/util/Base64.as ---------------------------------------------------------------------- diff --git a/flex-installer/common/src/com/hurlant/util/Base64.as b/flex-installer/common/src/com/hurlant/util/Base64.as new file mode 100644 index 0000000..79d6c51 --- /dev/null +++ b/flex-installer/common/src/com/hurlant/util/Base64.as @@ -0,0 +1,37 @@ +/** + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You 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. + + */ +/* + * This is a Flex-based replacement of a subset of the original, which was + * Copyright (C) 2012 Jean-Philippe Auclair + * Licensed under the MIT license. + */ +package com.hurlant.util { + + import flash.utils.ByteArray; + import mx.utils.Base64Encoder; + + public class Base64 { + + public static function encode(data:String):String { + var encoder:Base64Encoder = new Base64Encoder(); + encoder.encode(data); + return encoder.toString(); + } + } + +} http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/e09e191b/flex-installer/installer/src/InstallApacheFlex-app.xml ---------------------------------------------------------------------- diff --git a/flex-installer/installer/src/InstallApacheFlex-app.xml b/flex-installer/installer/src/InstallApacheFlex-app.xml index 19a6c84..5bb4946 100644 --- a/flex-installer/installer/src/InstallApacheFlex-app.xml +++ b/flex-installer/installer/src/InstallApacheFlex-app.xml @@ -17,7 +17,7 @@ limitations under the License. --> -<application xmlns="http://ns.adobe.com/air/application/4.0"> +<application xmlns="http://ns.adobe.com/air/application/30.0"> <!-- Adobe AIR Application Descriptor File Template.
