You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2018/06/14 22:33:55 UTC
[1/2] git commit: [flex-utilities] [refs/heads/develop] - for some
reason it would not build without this
Repository: flex-utilities
Updated Branches:
refs/heads/develop e6302faa6 -> e09e191bf
for some reason it would not build without this
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/118668a2
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/118668a2
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/118668a2
Branch: refs/heads/develop
Commit: 118668a2b72da770b1f11d99d36b00ad438d146e
Parents: e6302fa
Author: Alex Harui <ah...@apache.org>
Authored: Thu Jun 14 15:30:41 2018 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Jun 14 15:30:41 2018 -0700
----------------------------------------------------------------------
flex-installer/build.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/118668a2/flex-installer/build.xml
----------------------------------------------------------------------
diff --git a/flex-installer/build.xml b/flex-installer/build.xml
index d0129e5..4cf987e 100644
--- a/flex-installer/build.xml
+++ b/flex-installer/build.xml
@@ -326,6 +326,7 @@
<source-path path-element="${SOURCE_DIR}"/>
<source-path path-element="${COMMON_SOURCE_DIR}"/>
<external-library-path file="${AIR_HOME}/frameworks/libs/air/airglobal.swc" append="true"/>
+ <external-library-path file="${AIR_HOME}/frameworks/libs/air/applicationupdater.swc" append="true"/>
<library-path dir="${LIBRARY_DIR}" includes="*.swc" append="true"/>
<library-path dir="${ANT_ON_AIR_DIR}" includes="*.swc" append="true"/>
<!--<library-path dir="${LIBRARY_DIR}/temp/as3httpclient-master/lib" includes="*.swc" append="true"/>-->
Re: [2/2] git commit: [flex-utilities] [refs/heads/develop] - switch
to AIR 30 so we can use TLSSocket against TLS1.2. Replace the as3crypto
TLSSocket with our own that uses AIR 30 SecureSocket
Posted by Alex Harui <ah...@adobe.com.INVALID>.
Original code links.
https://github.com/timkurvers/as3-crypto/blob/master/src/com/hurlant/crypto/tls/TLSSocket.as
https://github.com/timkurvers/as3-crypto/blob/master/src/com/hurlant/util/Base64.as
-Alex
On 6/15/18, 9:00 AM, "Justin Mclean" <ju...@classsoftware.com> wrote:
Hi,
I don’t believe this is the correct way to handle this ie by replacing the 3rd party headers with ASF even though changes have been made. Can you point me to the original code?
Changes to 3rd party files are generally made under the original license and changes need to be major before adding an ASF header. You might want to read this [1] that come up on the incubator general list recently about the same issue. Also are you including the full text of the BSD license anywhere (perhaps it’s in another check in and I missed it) as that is required by the BSD license?
Thanks,
Justin
1. https://na01.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.apache.org%2Fthread.html%2F111ce40196f4f81c9b394fc7399298f72f7afc8d3cc144ed0f6320cc%40%253Cgeneral.incubator.apache.org%253E&data=02%7C01%7Caharui%40adobe.com%7C764ba1298ee742d343b308d5d2d919d5%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C636646752235329806&sdata=TVAjCOaT1QHZ2prdJ9vo8wILWxOs2%2BYoZuywCnIKraU%3D&reserved=0
Re: [2/2] git commit: [flex-utilities] [refs/heads/develop] - switch
to AIR 30 so we can use TLSSocket against TLS1.2. Replace the as3crypto
TLSSocket with our own that uses AIR 30 SecureSocket
Posted by Justin Mclean <ju...@classsoftware.com>.
Hi,
I don’t believe this is the correct way to handle this ie by replacing the 3rd party headers with ASF even though changes have been made. Can you point me to the original code?
Changes to 3rd party files are generally made under the original license and changes need to be major before adding an ASF header. You might want to read this [1] that come up on the incubator general list recently about the same issue. Also are you including the full text of the BSD license anywhere (perhaps it’s in another check in and I missed it) as that is required by the BSD license?
Thanks,
Justin
1. https://lists.apache.org/thread.html/111ce40196f4f81c9b394fc7399298f72f7afc8d3cc144ed0f6320cc@%3Cgeneral.incubator.apache.org%3E
[2/2] git commit: [flex-utilities] [refs/heads/develop] - switch to
AIR 30 so we can use TLSSocket against TLS1.2. Replace the as3crypto
TLSSocket with our own that uses AIR 30 SecureSocket
Posted by ah...@apache.org.
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 <ah...@apache.org>
Authored: Thu Jun 14 15:31:47 2018 -0700
Committer: Alex Harui <ah...@apache.org>
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.