diff options
author | Hiroshi Ichikawa <gimite@gmail.com> | 2011-09-17 19:56:27 +0900 |
---|---|---|
committer | Hiroshi Ichikawa <gimite@gmail.com> | 2011-09-17 19:56:27 +0900 |
commit | a308f867c7874844fa6547360fe96d5b97fa1deb (patch) | |
tree | afdfb21396423dc3f6b8fb1df091c84c946a63f4 | |
parent | 4be643b29c1146b085e6688d4850e935a165da09 (diff) | |
parent | 5c7df9d52083c5320a305a6f3b89ef4b08c89c16 (diff) | |
download | web-socket-js-a308f867c7874844fa6547360fe96d5b97fa1deb.tar.gz |
Merge branch 'master' into hybi-07
Conflicts:
WebSocketMain.swf
WebSocketMainInsecure.zip
-rw-r--r-- | WebSocketMain.swf | bin | 175519 -> 175594 bytes | |||
-rw-r--r-- | WebSocketMainInsecure.zip | bin | 166111 -> 166229 bytes | |||
-rwxr-xr-x | flash-src/build.sh | 19 | ||||
-rw-r--r-- | flash-src/build.xml | 58 | ||||
-rw-r--r-- | flash-src/src/net/gimite/websocket/IWebSocketLogger.as (renamed from flash-src/net/gimite/websocket/IWebSocketLogger.as) | 0 | ||||
-rw-r--r-- | flash-src/src/net/gimite/websocket/WebSocket.as (renamed from flash-src/net/gimite/websocket/WebSocket.as) | 0 | ||||
-rw-r--r-- | flash-src/src/net/gimite/websocket/WebSocketEvent.as (renamed from flash-src/net/gimite/websocket/WebSocketEvent.as) | 0 | ||||
-rw-r--r-- | flash-src/src/net/gimite/websocket/WebSocketMain.as (renamed from flash-src/net/gimite/websocket/WebSocketMain.as) | 0 | ||||
-rw-r--r-- | flash-src/src/net/gimite/websocket/WebSocketMainInsecure.as (renamed from flash-src/net/gimite/websocket/WebSocketMainInsecure.as) | 3 | ||||
-rw-r--r-- | flash-src/third-party/com/adobe/net/proxies/RFC2817Socket.as (renamed from flash-src/com/adobe/net/proxies/RFC2817Socket.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/gsolo/encryption/MD5.as (renamed from flash-src/com/gsolo/encryption/MD5.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/gsolo/encryption/SHA1.as (renamed from flash-src/com/gsolo/encryption/SHA1.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/Crypto.as (renamed from flash-src/com/hurlant/crypto/Crypto.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/crypto/cert/MozillaRootCertificates.as (renamed from flash-src/com/hurlant/crypto/cert/MozillaRootCertificates.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/crypto/cert/X509Certificate.as (renamed from flash-src/com/hurlant/crypto/cert/X509Certificate.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/crypto/cert/X509CertificateCollection.as (renamed from flash-src/com/hurlant/crypto/cert/X509CertificateCollection.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/hash/HMAC.as (renamed from flash-src/com/hurlant/crypto/hash/HMAC.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/crypto/hash/IHMAC.as (renamed from flash-src/com/hurlant/crypto/hash/IHMAC.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/hash/IHash.as (renamed from flash-src/com/hurlant/crypto/hash/IHash.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/crypto/hash/MAC.as (renamed from flash-src/com/hurlant/crypto/hash/MAC.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/hash/MD2.as (renamed from flash-src/com/hurlant/crypto/hash/MD2.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/hash/MD5.as (renamed from flash-src/com/hurlant/crypto/hash/MD5.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/hash/SHA1.as (renamed from flash-src/com/hurlant/crypto/hash/SHA1.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/hash/SHA224.as (renamed from flash-src/com/hurlant/crypto/hash/SHA224.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/hash/SHA256.as (renamed from flash-src/com/hurlant/crypto/hash/SHA256.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/hash/SHABase.as (renamed from flash-src/com/hurlant/crypto/hash/SHABase.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/prng/ARC4.as (renamed from flash-src/com/hurlant/crypto/prng/ARC4.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/prng/IPRNG.as (renamed from flash-src/com/hurlant/crypto/prng/IPRNG.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/prng/Random.as (renamed from flash-src/com/hurlant/crypto/prng/Random.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/prng/TLSPRF.as (renamed from flash-src/com/hurlant/crypto/prng/TLSPRF.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/rsa/RSAKey.as (renamed from flash-src/com/hurlant/crypto/rsa/RSAKey.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/symmetric/AESKey.as (renamed from flash-src/com/hurlant/crypto/symmetric/AESKey.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/symmetric/BlowFishKey.as (renamed from flash-src/com/hurlant/crypto/symmetric/BlowFishKey.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/symmetric/CBCMode.as (renamed from flash-src/com/hurlant/crypto/symmetric/CBCMode.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/symmetric/CFB8Mode.as (renamed from flash-src/com/hurlant/crypto/symmetric/CFB8Mode.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/symmetric/CFBMode.as (renamed from flash-src/com/hurlant/crypto/symmetric/CFBMode.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/symmetric/CTRMode.as (renamed from flash-src/com/hurlant/crypto/symmetric/CTRMode.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/symmetric/DESKey.as (renamed from flash-src/com/hurlant/crypto/symmetric/DESKey.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/symmetric/ECBMode.as (renamed from flash-src/com/hurlant/crypto/symmetric/ECBMode.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/symmetric/ICipher.as (renamed from flash-src/com/hurlant/crypto/symmetric/ICipher.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/symmetric/IMode.as (renamed from flash-src/com/hurlant/crypto/symmetric/IMode.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/symmetric/IPad.as (renamed from flash-src/com/hurlant/crypto/symmetric/IPad.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/symmetric/IStreamCipher.as (renamed from flash-src/com/hurlant/crypto/symmetric/IStreamCipher.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/symmetric/ISymmetricKey.as (renamed from flash-src/com/hurlant/crypto/symmetric/ISymmetricKey.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/symmetric/IVMode.as (renamed from flash-src/com/hurlant/crypto/symmetric/IVMode.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/symmetric/NullPad.as (renamed from flash-src/com/hurlant/crypto/symmetric/NullPad.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/symmetric/OFBMode.as (renamed from flash-src/com/hurlant/crypto/symmetric/OFBMode.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/symmetric/PKCS5.as (renamed from flash-src/com/hurlant/crypto/symmetric/PKCS5.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/crypto/symmetric/SSLPad.as (renamed from flash-src/com/hurlant/crypto/symmetric/SSLPad.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/symmetric/SimpleIVMode.as (renamed from flash-src/com/hurlant/crypto/symmetric/SimpleIVMode.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/symmetric/TLSPad.as (renamed from flash-src/com/hurlant/crypto/symmetric/TLSPad.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/symmetric/TripleDESKey.as (renamed from flash-src/com/hurlant/crypto/symmetric/TripleDESKey.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/symmetric/XTeaKey.as (renamed from flash-src/com/hurlant/crypto/symmetric/XTeaKey.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/symmetric/aeskey.pl (renamed from flash-src/com/hurlant/crypto/symmetric/aeskey.pl) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/symmetric/dump.txt (renamed from flash-src/com/hurlant/crypto/symmetric/dump.txt) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/crypto/tests/AESKeyTest.as (renamed from flash-src/com/hurlant/crypto/tests/AESKeyTest.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/crypto/tests/ARC4Test.as (renamed from flash-src/com/hurlant/crypto/tests/ARC4Test.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/crypto/tests/BigIntegerTest.as (renamed from flash-src/com/hurlant/crypto/tests/BigIntegerTest.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/crypto/tests/BlowFishKeyTest.as (renamed from flash-src/com/hurlant/crypto/tests/BlowFishKeyTest.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/crypto/tests/CBCModeTest.as (renamed from flash-src/com/hurlant/crypto/tests/CBCModeTest.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/crypto/tests/CFB8ModeTest.as (renamed from flash-src/com/hurlant/crypto/tests/CFB8ModeTest.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/crypto/tests/CFBModeTest.as (renamed from flash-src/com/hurlant/crypto/tests/CFBModeTest.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/crypto/tests/CTRModeTest.as (renamed from flash-src/com/hurlant/crypto/tests/CTRModeTest.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/crypto/tests/DESKeyTest.as (renamed from flash-src/com/hurlant/crypto/tests/DESKeyTest.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/crypto/tests/ECBModeTest.as (renamed from flash-src/com/hurlant/crypto/tests/ECBModeTest.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/crypto/tests/HMACTest.as (renamed from flash-src/com/hurlant/crypto/tests/HMACTest.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/crypto/tests/ITestHarness.as (renamed from flash-src/com/hurlant/crypto/tests/ITestHarness.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/crypto/tests/MD2Test.as (renamed from flash-src/com/hurlant/crypto/tests/MD2Test.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/crypto/tests/MD5Test.as (renamed from flash-src/com/hurlant/crypto/tests/MD5Test.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/crypto/tests/OFBModeTest.as (renamed from flash-src/com/hurlant/crypto/tests/OFBModeTest.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/crypto/tests/RSAKeyTest.as (renamed from flash-src/com/hurlant/crypto/tests/RSAKeyTest.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/crypto/tests/SHA1Test.as (renamed from flash-src/com/hurlant/crypto/tests/SHA1Test.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/crypto/tests/SHA224Test.as (renamed from flash-src/com/hurlant/crypto/tests/SHA224Test.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/crypto/tests/SHA256Test.as (renamed from flash-src/com/hurlant/crypto/tests/SHA256Test.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/crypto/tests/TLSPRFTest.as (renamed from flash-src/com/hurlant/crypto/tests/TLSPRFTest.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/crypto/tests/TestCase.as (renamed from flash-src/com/hurlant/crypto/tests/TestCase.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/crypto/tests/TripleDESKeyTest.as (renamed from flash-src/com/hurlant/crypto/tests/TripleDESKeyTest.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/crypto/tests/XTeaKeyTest.as (renamed from flash-src/com/hurlant/crypto/tests/XTeaKeyTest.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/tls/BulkCiphers.as (renamed from flash-src/com/hurlant/crypto/tls/BulkCiphers.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/tls/CipherSuites.as (renamed from flash-src/com/hurlant/crypto/tls/CipherSuites.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/tls/IConnectionState.as (renamed from flash-src/com/hurlant/crypto/tls/IConnectionState.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/crypto/tls/ISecurityParameters.as (renamed from flash-src/com/hurlant/crypto/tls/ISecurityParameters.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/tls/KeyExchanges.as (renamed from flash-src/com/hurlant/crypto/tls/KeyExchanges.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/tls/MACs.as (renamed from flash-src/com/hurlant/crypto/tls/MACs.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/tls/SSLConnectionState.as (renamed from flash-src/com/hurlant/crypto/tls/SSLConnectionState.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/crypto/tls/SSLEvent.as (renamed from flash-src/com/hurlant/crypto/tls/SSLEvent.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/crypto/tls/SSLSecurityParameters.as (renamed from flash-src/com/hurlant/crypto/tls/SSLSecurityParameters.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/tls/TLSConfig.as (renamed from flash-src/com/hurlant/crypto/tls/TLSConfig.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/tls/TLSConnectionState.as (renamed from flash-src/com/hurlant/crypto/tls/TLSConnectionState.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/tls/TLSEngine.as (renamed from flash-src/com/hurlant/crypto/tls/TLSEngine.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/tls/TLSError.as (renamed from flash-src/com/hurlant/crypto/tls/TLSError.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/tls/TLSEvent.as (renamed from flash-src/com/hurlant/crypto/tls/TLSEvent.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/tls/TLSSecurityParameters.as (renamed from flash-src/com/hurlant/crypto/tls/TLSSecurityParameters.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/tls/TLSSocket.as (renamed from flash-src/com/hurlant/crypto/tls/TLSSocket.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/tls/TLSSocketEvent.as (renamed from flash-src/com/hurlant/crypto/tls/TLSSocketEvent.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/crypto/tls/TLSTest.as (renamed from flash-src/com/hurlant/crypto/tls/TLSTest.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/math/BarrettReduction.as (renamed from flash-src/com/hurlant/math/BarrettReduction.as) | 0 | ||||
-rw-r--r-- | flash-src/third-party/com/hurlant/math/BigInteger.as (renamed from flash-src/com/hurlant/math/BigInteger.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/math/ClassicReduction.as (renamed from flash-src/com/hurlant/math/ClassicReduction.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/math/IReduction.as (renamed from flash-src/com/hurlant/math/IReduction.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/math/MontgomeryReduction.as (renamed from flash-src/com/hurlant/math/MontgomeryReduction.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/math/NullReduction.as (renamed from flash-src/com/hurlant/math/NullReduction.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/math/bi_internal.as (renamed from flash-src/com/hurlant/math/bi_internal.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/util/ArrayUtil.as (renamed from flash-src/com/hurlant/util/ArrayUtil.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/util/Base64.as (renamed from flash-src/com/hurlant/util/Base64.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/util/Hex.as (renamed from flash-src/com/hurlant/util/Hex.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/util/Memory.as (renamed from flash-src/com/hurlant/util/Memory.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/util/der/ByteString.as (renamed from flash-src/com/hurlant/util/der/ByteString.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/util/der/DER.as (renamed from flash-src/com/hurlant/util/der/DER.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/util/der/IAsn1Type.as (renamed from flash-src/com/hurlant/util/der/IAsn1Type.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/util/der/Integer.as (renamed from flash-src/com/hurlant/util/der/Integer.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/util/der/OID.as (renamed from flash-src/com/hurlant/util/der/OID.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/util/der/ObjectIdentifier.as (renamed from flash-src/com/hurlant/util/der/ObjectIdentifier.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/util/der/PEM.as (renamed from flash-src/com/hurlant/util/der/PEM.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/util/der/PrintableString.as (renamed from flash-src/com/hurlant/util/der/PrintableString.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/util/der/Sequence.as (renamed from flash-src/com/hurlant/util/der/Sequence.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/util/der/Set.as (renamed from flash-src/com/hurlant/util/der/Set.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/util/der/Type.as (renamed from flash-src/com/hurlant/util/der/Type.as) | 0 | ||||
-rwxr-xr-x | flash-src/third-party/com/hurlant/util/der/UTCTime.as (renamed from flash-src/com/hurlant/util/der/UTCTime.as) | 0 | ||||
-rw-r--r-- | web_socket.js | 11 |
120 files changed, 73 insertions, 18 deletions
diff --git a/WebSocketMain.swf b/WebSocketMain.swf Binary files differindex 073d923..7186194 100644 --- a/WebSocketMain.swf +++ b/WebSocketMain.swf diff --git a/WebSocketMainInsecure.zip b/WebSocketMainInsecure.zip Binary files differindex c0ce704..691aec4 100644 --- a/WebSocketMainInsecure.zip +++ b/WebSocketMainInsecure.zip diff --git a/flash-src/build.sh b/flash-src/build.sh index 0fb02a5..8f32185 100755 --- a/flash-src/build.sh +++ b/flash-src/build.sh @@ -5,8 +5,21 @@ # You need Flex 4 SDK: # http://opensource.adobe.com/wiki/display/flexsdk/Download+Flex+4 -mxmlc -static-link-runtime-shared-libraries -target-player=10.0.0 -output=../WebSocketMain.swf -source-path=. net/gimite/websocket/WebSocketMain.as && -mxmlc -static-link-runtime-shared-libraries -output=../WebSocketMainInsecure.swf -source-path=. net/gimite/websocket/WebSocketMainInsecure.as && +mxmlc \ + -static-link-runtime-shared-libraries \ + -target-player=10.0.0 \ + -output=../WebSocketMain.swf \ + -source-path=src -source-path=third-party \ + src/net/gimite/websocket/WebSocketMain.as && + +mxmlc \ + -static-link-runtime-shared-libraries \ + -target-player=10.0.0 \ + -output=../WebSocketMainInsecure.swf \ + -source-path=src -source-path=third-party \ + src/net/gimite/websocket/WebSocketMainInsecure.as && + cd .. && + zip WebSocketMainInsecure.zip WebSocketMainInsecure.swf && -rm WebSocketMainInsecure.swf +rm WebSocketMainInsecure.swf diff --git a/flash-src/build.xml b/flash-src/build.xml index 9f42796..178f719 100644 --- a/flash-src/build.xml +++ b/flash-src/build.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - Ant build file which provides Yet another way (other than build.sh) to build SWF files. + Ant build file which provides yet another way (other than build.sh) to build SWF files. You need to copy build.properties.sample to build.properties and change FLEX_HOME for your environment. @@ -9,15 +9,14 @@ <project name="ant" basedir="." default="swf"> -<property file="build.properties" /><!-- set sdk --> -<echo message="Using SDK version: ${FLEX_HOME}" /> +<property file="build.properties"/><!-- set sdk --> +<echo message="Using SDK version: ${FLEX_HOME}"/> <!-- do not change next 2 lines, it adds needed task to ant --> <property name="FLEXTASKS" value="${FLEX_HOME}/ant/lib/flexTasks.jar"/> <taskdef resource="flexTasks.tasks" classpath="${FLEXTASKS}"/> <target name="swf"> - <delete file="../WebSocketMain.swf"/> - <mxmlc file="net/gimite/websocket/WebSocketMain.as" + <mxmlc file="src/net/gimite/websocket/WebSocketMain.as" output="../WebSocketMain.swf" incremental="false" strict="true" @@ -27,13 +26,13 @@ <optimize>true</optimize> <target-player>10</target-player> <raw-metadata></raw-metadata> - <source-path path-element="."/> + <source-path path-element="src"/> + <source-path path-element="third-party"/> </mxmlc> </target> <target name="swfInsecure"> - <delete file="../WebSocketMainInsecure.swf" /> - <mxmlc file="net/gimite/websocket/WebSocketMainInsecure.as" + <mxmlc file="src/net/gimite/websocket/WebSocketMainInsecure.as" output="../WebSocketMainInsecure.swf" incremental="false" strict="true" @@ -43,12 +42,13 @@ <optimize>true</optimize> <target-player>10</target-player> <raw-metadata></raw-metadata> - <source-path path-element="."/> + <source-path path-element="src"/> + <source-path path-element="third-party"/> </mxmlc> </target> -<target name="swc" ><!-- for pure .as --> - <delete file="../WebSocket.swc" /> +<!-- for pure .as --> +<target name="swc" depends="swcWithoutDependencies,dependencies"> <compc output="../WebSocket.swc" incremental="false" strict="true" @@ -57,8 +57,40 @@ static-link-runtime-shared-libraries="false"> <optimize>true</optimize> <raw-metadata></raw-metadata> - <include-sources dir="." includes="**/*.as"/> - <source-path path-element="."/> + <include-libraries dir=".." append="true" > + <include name="WebSocketWithoutDependencies.swc"/> + <include name="WebSocketDependencies.swc"/> + </include-libraries> + </compc> +</target> + +<!-- for pure .as where you want to link your own version of third-party libraries --> +<target name="swcWithoutDependencies" depends="dependencies"> + <compc output="../WebSocketWithoutDependencies.swc" + incremental="false" + strict="true" + accessible="false" + fork="true" + static-link-runtime-shared-libraries="false"> + <optimize>true</optimize> + <raw-metadata></raw-metadata> + <source-path path-element="src"/> + <include-sources dir="." includes="**/*.as"/> + <external-library-path file="../WebSocketDependencies.swc" append="true"/> + </compc> +</target> + +<target name="dependencies"> + <compc output="../WebSocketDependencies.swc" + incremental="false" + strict="true" + accessible="false" + fork="true" + static-link-runtime-shared-libraries="false"> + <optimize>true</optimize> + <raw-metadata></raw-metadata> + <source-path path-element="third-party"/> + <include-sources dir="." includes="**/*.as"/> </compc> </target> diff --git a/flash-src/net/gimite/websocket/IWebSocketLogger.as b/flash-src/src/net/gimite/websocket/IWebSocketLogger.as index c3384f3..c3384f3 100644 --- a/flash-src/net/gimite/websocket/IWebSocketLogger.as +++ b/flash-src/src/net/gimite/websocket/IWebSocketLogger.as diff --git a/flash-src/net/gimite/websocket/WebSocket.as b/flash-src/src/net/gimite/websocket/WebSocket.as index 3bafd63..3bafd63 100644 --- a/flash-src/net/gimite/websocket/WebSocket.as +++ b/flash-src/src/net/gimite/websocket/WebSocket.as diff --git a/flash-src/net/gimite/websocket/WebSocketEvent.as b/flash-src/src/net/gimite/websocket/WebSocketEvent.as index aa17cac..aa17cac 100644 --- a/flash-src/net/gimite/websocket/WebSocketEvent.as +++ b/flash-src/src/net/gimite/websocket/WebSocketEvent.as diff --git a/flash-src/net/gimite/websocket/WebSocketMain.as b/flash-src/src/net/gimite/websocket/WebSocketMain.as index 891a5d1..891a5d1 100644 --- a/flash-src/net/gimite/websocket/WebSocketMain.as +++ b/flash-src/src/net/gimite/websocket/WebSocketMain.as diff --git a/flash-src/net/gimite/websocket/WebSocketMainInsecure.as b/flash-src/src/net/gimite/websocket/WebSocketMainInsecure.as index eb4f426..214f31e 100644 --- a/flash-src/net/gimite/websocket/WebSocketMainInsecure.as +++ b/flash-src/src/net/gimite/websocket/WebSocketMainInsecure.as @@ -11,6 +11,9 @@ public class WebSocketMainInsecure extends WebSocketMain { public function WebSocketMainInsecure() { Security.allowDomain("*"); + // Also allows HTTP -> HTTPS call. Since we have already allowed arbitrary domains, allowing + // HTTP -> HTTPS would not be more dangerous. + Security.allowInsecureDomain("*"); super(); } diff --git a/flash-src/com/adobe/net/proxies/RFC2817Socket.as b/flash-src/third-party/com/adobe/net/proxies/RFC2817Socket.as index c52ee39..c52ee39 100644 --- a/flash-src/com/adobe/net/proxies/RFC2817Socket.as +++ b/flash-src/third-party/com/adobe/net/proxies/RFC2817Socket.as diff --git a/flash-src/com/gsolo/encryption/MD5.as b/flash-src/third-party/com/gsolo/encryption/MD5.as index e5d9c4a..e5d9c4a 100644 --- a/flash-src/com/gsolo/encryption/MD5.as +++ b/flash-src/third-party/com/gsolo/encryption/MD5.as diff --git a/flash-src/com/gsolo/encryption/SHA1.as b/flash-src/third-party/com/gsolo/encryption/SHA1.as index 12f64c5..12f64c5 100644 --- a/flash-src/com/gsolo/encryption/SHA1.as +++ b/flash-src/third-party/com/gsolo/encryption/SHA1.as diff --git a/flash-src/com/hurlant/crypto/Crypto.as b/flash-src/third-party/com/hurlant/crypto/Crypto.as index 32ec97a..32ec97a 100644 --- a/flash-src/com/hurlant/crypto/Crypto.as +++ b/flash-src/third-party/com/hurlant/crypto/Crypto.as diff --git a/flash-src/com/hurlant/crypto/cert/MozillaRootCertificates.as b/flash-src/third-party/com/hurlant/crypto/cert/MozillaRootCertificates.as index cc2e269..cc2e269 100755 --- a/flash-src/com/hurlant/crypto/cert/MozillaRootCertificates.as +++ b/flash-src/third-party/com/hurlant/crypto/cert/MozillaRootCertificates.as diff --git a/flash-src/com/hurlant/crypto/cert/X509Certificate.as b/flash-src/third-party/com/hurlant/crypto/cert/X509Certificate.as index db4ea1c..db4ea1c 100755 --- a/flash-src/com/hurlant/crypto/cert/X509Certificate.as +++ b/flash-src/third-party/com/hurlant/crypto/cert/X509Certificate.as diff --git a/flash-src/com/hurlant/crypto/cert/X509CertificateCollection.as b/flash-src/third-party/com/hurlant/crypto/cert/X509CertificateCollection.as index db11e40..db11e40 100755 --- a/flash-src/com/hurlant/crypto/cert/X509CertificateCollection.as +++ b/flash-src/third-party/com/hurlant/crypto/cert/X509CertificateCollection.as diff --git a/flash-src/com/hurlant/crypto/hash/HMAC.as b/flash-src/third-party/com/hurlant/crypto/hash/HMAC.as index 8215afc..8215afc 100644 --- a/flash-src/com/hurlant/crypto/hash/HMAC.as +++ b/flash-src/third-party/com/hurlant/crypto/hash/HMAC.as diff --git a/flash-src/com/hurlant/crypto/hash/IHMAC.as b/flash-src/third-party/com/hurlant/crypto/hash/IHMAC.as index f0ee063..f0ee063 100755 --- a/flash-src/com/hurlant/crypto/hash/IHMAC.as +++ b/flash-src/third-party/com/hurlant/crypto/hash/IHMAC.as diff --git a/flash-src/com/hurlant/crypto/hash/IHash.as b/flash-src/third-party/com/hurlant/crypto/hash/IHash.as index 32c5321..32c5321 100644 --- a/flash-src/com/hurlant/crypto/hash/IHash.as +++ b/flash-src/third-party/com/hurlant/crypto/hash/IHash.as diff --git a/flash-src/com/hurlant/crypto/hash/MAC.as b/flash-src/third-party/com/hurlant/crypto/hash/MAC.as index 0815d6c..0815d6c 100755 --- a/flash-src/com/hurlant/crypto/hash/MAC.as +++ b/flash-src/third-party/com/hurlant/crypto/hash/MAC.as diff --git a/flash-src/com/hurlant/crypto/hash/MD2.as b/flash-src/third-party/com/hurlant/crypto/hash/MD2.as index e104f0d..e104f0d 100644 --- a/flash-src/com/hurlant/crypto/hash/MD2.as +++ b/flash-src/third-party/com/hurlant/crypto/hash/MD2.as diff --git a/flash-src/com/hurlant/crypto/hash/MD5.as b/flash-src/third-party/com/hurlant/crypto/hash/MD5.as index 81836ed..81836ed 100644 --- a/flash-src/com/hurlant/crypto/hash/MD5.as +++ b/flash-src/third-party/com/hurlant/crypto/hash/MD5.as diff --git a/flash-src/com/hurlant/crypto/hash/SHA1.as b/flash-src/third-party/com/hurlant/crypto/hash/SHA1.as index 5b186f3..5b186f3 100644 --- a/flash-src/com/hurlant/crypto/hash/SHA1.as +++ b/flash-src/third-party/com/hurlant/crypto/hash/SHA1.as diff --git a/flash-src/com/hurlant/crypto/hash/SHA224.as b/flash-src/third-party/com/hurlant/crypto/hash/SHA224.as index 345aa3d..345aa3d 100644 --- a/flash-src/com/hurlant/crypto/hash/SHA224.as +++ b/flash-src/third-party/com/hurlant/crypto/hash/SHA224.as diff --git a/flash-src/com/hurlant/crypto/hash/SHA256.as b/flash-src/third-party/com/hurlant/crypto/hash/SHA256.as index 67bdbb4..67bdbb4 100644 --- a/flash-src/com/hurlant/crypto/hash/SHA256.as +++ b/flash-src/third-party/com/hurlant/crypto/hash/SHA256.as diff --git a/flash-src/com/hurlant/crypto/hash/SHABase.as b/flash-src/third-party/com/hurlant/crypto/hash/SHABase.as index dc9bafe..dc9bafe 100644 --- a/flash-src/com/hurlant/crypto/hash/SHABase.as +++ b/flash-src/third-party/com/hurlant/crypto/hash/SHABase.as diff --git a/flash-src/com/hurlant/crypto/prng/ARC4.as b/flash-src/third-party/com/hurlant/crypto/prng/ARC4.as index f09a638..f09a638 100644 --- a/flash-src/com/hurlant/crypto/prng/ARC4.as +++ b/flash-src/third-party/com/hurlant/crypto/prng/ARC4.as diff --git a/flash-src/com/hurlant/crypto/prng/IPRNG.as b/flash-src/third-party/com/hurlant/crypto/prng/IPRNG.as index 2c61e93..2c61e93 100644 --- a/flash-src/com/hurlant/crypto/prng/IPRNG.as +++ b/flash-src/third-party/com/hurlant/crypto/prng/IPRNG.as diff --git a/flash-src/com/hurlant/crypto/prng/Random.as b/flash-src/third-party/com/hurlant/crypto/prng/Random.as index f6f5184..f6f5184 100644 --- a/flash-src/com/hurlant/crypto/prng/Random.as +++ b/flash-src/third-party/com/hurlant/crypto/prng/Random.as diff --git a/flash-src/com/hurlant/crypto/prng/TLSPRF.as b/flash-src/third-party/com/hurlant/crypto/prng/TLSPRF.as index 97553d4..97553d4 100644 --- a/flash-src/com/hurlant/crypto/prng/TLSPRF.as +++ b/flash-src/third-party/com/hurlant/crypto/prng/TLSPRF.as diff --git a/flash-src/com/hurlant/crypto/rsa/RSAKey.as b/flash-src/third-party/com/hurlant/crypto/rsa/RSAKey.as index 02fd83d..02fd83d 100644 --- a/flash-src/com/hurlant/crypto/rsa/RSAKey.as +++ b/flash-src/third-party/com/hurlant/crypto/rsa/RSAKey.as diff --git a/flash-src/com/hurlant/crypto/symmetric/AESKey.as b/flash-src/third-party/com/hurlant/crypto/symmetric/AESKey.as index a2280b7..a2280b7 100644 --- a/flash-src/com/hurlant/crypto/symmetric/AESKey.as +++ b/flash-src/third-party/com/hurlant/crypto/symmetric/AESKey.as diff --git a/flash-src/com/hurlant/crypto/symmetric/BlowFishKey.as b/flash-src/third-party/com/hurlant/crypto/symmetric/BlowFishKey.as index c3350cb..c3350cb 100644 --- a/flash-src/com/hurlant/crypto/symmetric/BlowFishKey.as +++ b/flash-src/third-party/com/hurlant/crypto/symmetric/BlowFishKey.as diff --git a/flash-src/com/hurlant/crypto/symmetric/CBCMode.as b/flash-src/third-party/com/hurlant/crypto/symmetric/CBCMode.as index e3781be..e3781be 100644 --- a/flash-src/com/hurlant/crypto/symmetric/CBCMode.as +++ b/flash-src/third-party/com/hurlant/crypto/symmetric/CBCMode.as diff --git a/flash-src/com/hurlant/crypto/symmetric/CFB8Mode.as b/flash-src/third-party/com/hurlant/crypto/symmetric/CFB8Mode.as index 9baa284..9baa284 100644 --- a/flash-src/com/hurlant/crypto/symmetric/CFB8Mode.as +++ b/flash-src/third-party/com/hurlant/crypto/symmetric/CFB8Mode.as diff --git a/flash-src/com/hurlant/crypto/symmetric/CFBMode.as b/flash-src/third-party/com/hurlant/crypto/symmetric/CFBMode.as index 7b748b9..7b748b9 100644 --- a/flash-src/com/hurlant/crypto/symmetric/CFBMode.as +++ b/flash-src/third-party/com/hurlant/crypto/symmetric/CFBMode.as diff --git a/flash-src/com/hurlant/crypto/symmetric/CTRMode.as b/flash-src/third-party/com/hurlant/crypto/symmetric/CTRMode.as index fcd1284..fcd1284 100644 --- a/flash-src/com/hurlant/crypto/symmetric/CTRMode.as +++ b/flash-src/third-party/com/hurlant/crypto/symmetric/CTRMode.as diff --git a/flash-src/com/hurlant/crypto/symmetric/DESKey.as b/flash-src/third-party/com/hurlant/crypto/symmetric/DESKey.as index 4a0b755..4a0b755 100644 --- a/flash-src/com/hurlant/crypto/symmetric/DESKey.as +++ b/flash-src/third-party/com/hurlant/crypto/symmetric/DESKey.as diff --git a/flash-src/com/hurlant/crypto/symmetric/ECBMode.as b/flash-src/third-party/com/hurlant/crypto/symmetric/ECBMode.as index b2a7b77..b2a7b77 100644 --- a/flash-src/com/hurlant/crypto/symmetric/ECBMode.as +++ b/flash-src/third-party/com/hurlant/crypto/symmetric/ECBMode.as diff --git a/flash-src/com/hurlant/crypto/symmetric/ICipher.as b/flash-src/third-party/com/hurlant/crypto/symmetric/ICipher.as index 328c024..328c024 100644 --- a/flash-src/com/hurlant/crypto/symmetric/ICipher.as +++ b/flash-src/third-party/com/hurlant/crypto/symmetric/ICipher.as diff --git a/flash-src/com/hurlant/crypto/symmetric/IMode.as b/flash-src/third-party/com/hurlant/crypto/symmetric/IMode.as index 8a99b06..8a99b06 100644 --- a/flash-src/com/hurlant/crypto/symmetric/IMode.as +++ b/flash-src/third-party/com/hurlant/crypto/symmetric/IMode.as diff --git a/flash-src/com/hurlant/crypto/symmetric/IPad.as b/flash-src/third-party/com/hurlant/crypto/symmetric/IPad.as index c686e26..c686e26 100644 --- a/flash-src/com/hurlant/crypto/symmetric/IPad.as +++ b/flash-src/third-party/com/hurlant/crypto/symmetric/IPad.as diff --git a/flash-src/com/hurlant/crypto/symmetric/IStreamCipher.as b/flash-src/third-party/com/hurlant/crypto/symmetric/IStreamCipher.as index fbcbf24..fbcbf24 100644 --- a/flash-src/com/hurlant/crypto/symmetric/IStreamCipher.as +++ b/flash-src/third-party/com/hurlant/crypto/symmetric/IStreamCipher.as diff --git a/flash-src/com/hurlant/crypto/symmetric/ISymmetricKey.as b/flash-src/third-party/com/hurlant/crypto/symmetric/ISymmetricKey.as index 1699db5..1699db5 100644 --- a/flash-src/com/hurlant/crypto/symmetric/ISymmetricKey.as +++ b/flash-src/third-party/com/hurlant/crypto/symmetric/ISymmetricKey.as diff --git a/flash-src/com/hurlant/crypto/symmetric/IVMode.as b/flash-src/third-party/com/hurlant/crypto/symmetric/IVMode.as index 100041a..100041a 100644 --- a/flash-src/com/hurlant/crypto/symmetric/IVMode.as +++ b/flash-src/third-party/com/hurlant/crypto/symmetric/IVMode.as diff --git a/flash-src/com/hurlant/crypto/symmetric/NullPad.as b/flash-src/third-party/com/hurlant/crypto/symmetric/NullPad.as index 25f8c04..25f8c04 100644 --- a/flash-src/com/hurlant/crypto/symmetric/NullPad.as +++ b/flash-src/third-party/com/hurlant/crypto/symmetric/NullPad.as diff --git a/flash-src/com/hurlant/crypto/symmetric/OFBMode.as b/flash-src/third-party/com/hurlant/crypto/symmetric/OFBMode.as index 8b41736..8b41736 100644 --- a/flash-src/com/hurlant/crypto/symmetric/OFBMode.as +++ b/flash-src/third-party/com/hurlant/crypto/symmetric/OFBMode.as diff --git a/flash-src/com/hurlant/crypto/symmetric/PKCS5.as b/flash-src/third-party/com/hurlant/crypto/symmetric/PKCS5.as index 598daa0..598daa0 100644 --- a/flash-src/com/hurlant/crypto/symmetric/PKCS5.as +++ b/flash-src/third-party/com/hurlant/crypto/symmetric/PKCS5.as diff --git a/flash-src/com/hurlant/crypto/symmetric/SSLPad.as b/flash-src/third-party/com/hurlant/crypto/symmetric/SSLPad.as index 8dd1324..8dd1324 100755 --- a/flash-src/com/hurlant/crypto/symmetric/SSLPad.as +++ b/flash-src/third-party/com/hurlant/crypto/symmetric/SSLPad.as diff --git a/flash-src/com/hurlant/crypto/symmetric/SimpleIVMode.as b/flash-src/third-party/com/hurlant/crypto/symmetric/SimpleIVMode.as index 590f0df..590f0df 100644 --- a/flash-src/com/hurlant/crypto/symmetric/SimpleIVMode.as +++ b/flash-src/third-party/com/hurlant/crypto/symmetric/SimpleIVMode.as diff --git a/flash-src/com/hurlant/crypto/symmetric/TLSPad.as b/flash-src/third-party/com/hurlant/crypto/symmetric/TLSPad.as index f3b6182..f3b6182 100644 --- a/flash-src/com/hurlant/crypto/symmetric/TLSPad.as +++ b/flash-src/third-party/com/hurlant/crypto/symmetric/TLSPad.as diff --git a/flash-src/com/hurlant/crypto/symmetric/TripleDESKey.as b/flash-src/third-party/com/hurlant/crypto/symmetric/TripleDESKey.as index 1e75011..1e75011 100644 --- a/flash-src/com/hurlant/crypto/symmetric/TripleDESKey.as +++ b/flash-src/third-party/com/hurlant/crypto/symmetric/TripleDESKey.as diff --git a/flash-src/com/hurlant/crypto/symmetric/XTeaKey.as b/flash-src/third-party/com/hurlant/crypto/symmetric/XTeaKey.as index 9d140dd..9d140dd 100644 --- a/flash-src/com/hurlant/crypto/symmetric/XTeaKey.as +++ b/flash-src/third-party/com/hurlant/crypto/symmetric/XTeaKey.as diff --git a/flash-src/com/hurlant/crypto/symmetric/aeskey.pl b/flash-src/third-party/com/hurlant/crypto/symmetric/aeskey.pl index b8f58fd..b8f58fd 100644 --- a/flash-src/com/hurlant/crypto/symmetric/aeskey.pl +++ b/flash-src/third-party/com/hurlant/crypto/symmetric/aeskey.pl diff --git a/flash-src/com/hurlant/crypto/symmetric/dump.txt b/flash-src/third-party/com/hurlant/crypto/symmetric/dump.txt index 6206701..6206701 100644 --- a/flash-src/com/hurlant/crypto/symmetric/dump.txt +++ b/flash-src/third-party/com/hurlant/crypto/symmetric/dump.txt diff --git a/flash-src/com/hurlant/crypto/tests/AESKeyTest.as b/flash-src/third-party/com/hurlant/crypto/tests/AESKeyTest.as index c43fc5f..c43fc5f 100755 --- a/flash-src/com/hurlant/crypto/tests/AESKeyTest.as +++ b/flash-src/third-party/com/hurlant/crypto/tests/AESKeyTest.as diff --git a/flash-src/com/hurlant/crypto/tests/ARC4Test.as b/flash-src/third-party/com/hurlant/crypto/tests/ARC4Test.as index 94683c3..94683c3 100755 --- a/flash-src/com/hurlant/crypto/tests/ARC4Test.as +++ b/flash-src/third-party/com/hurlant/crypto/tests/ARC4Test.as diff --git a/flash-src/com/hurlant/crypto/tests/BigIntegerTest.as b/flash-src/third-party/com/hurlant/crypto/tests/BigIntegerTest.as index ac6a4ee..ac6a4ee 100755 --- a/flash-src/com/hurlant/crypto/tests/BigIntegerTest.as +++ b/flash-src/third-party/com/hurlant/crypto/tests/BigIntegerTest.as diff --git a/flash-src/com/hurlant/crypto/tests/BlowFishKeyTest.as b/flash-src/third-party/com/hurlant/crypto/tests/BlowFishKeyTest.as index 96645fb..96645fb 100755 --- a/flash-src/com/hurlant/crypto/tests/BlowFishKeyTest.as +++ b/flash-src/third-party/com/hurlant/crypto/tests/BlowFishKeyTest.as diff --git a/flash-src/com/hurlant/crypto/tests/CBCModeTest.as b/flash-src/third-party/com/hurlant/crypto/tests/CBCModeTest.as index 153aa00..153aa00 100755 --- a/flash-src/com/hurlant/crypto/tests/CBCModeTest.as +++ b/flash-src/third-party/com/hurlant/crypto/tests/CBCModeTest.as diff --git a/flash-src/com/hurlant/crypto/tests/CFB8ModeTest.as b/flash-src/third-party/com/hurlant/crypto/tests/CFB8ModeTest.as index 481277f..481277f 100755 --- a/flash-src/com/hurlant/crypto/tests/CFB8ModeTest.as +++ b/flash-src/third-party/com/hurlant/crypto/tests/CFB8ModeTest.as diff --git a/flash-src/com/hurlant/crypto/tests/CFBModeTest.as b/flash-src/third-party/com/hurlant/crypto/tests/CFBModeTest.as index 9d63fe0..9d63fe0 100755 --- a/flash-src/com/hurlant/crypto/tests/CFBModeTest.as +++ b/flash-src/third-party/com/hurlant/crypto/tests/CFBModeTest.as diff --git a/flash-src/com/hurlant/crypto/tests/CTRModeTest.as b/flash-src/third-party/com/hurlant/crypto/tests/CTRModeTest.as index d82fda2..d82fda2 100755 --- a/flash-src/com/hurlant/crypto/tests/CTRModeTest.as +++ b/flash-src/third-party/com/hurlant/crypto/tests/CTRModeTest.as diff --git a/flash-src/com/hurlant/crypto/tests/DESKeyTest.as b/flash-src/third-party/com/hurlant/crypto/tests/DESKeyTest.as index 5d09e01..5d09e01 100755 --- a/flash-src/com/hurlant/crypto/tests/DESKeyTest.as +++ b/flash-src/third-party/com/hurlant/crypto/tests/DESKeyTest.as diff --git a/flash-src/com/hurlant/crypto/tests/ECBModeTest.as b/flash-src/third-party/com/hurlant/crypto/tests/ECBModeTest.as index 2f0179c..2f0179c 100755 --- a/flash-src/com/hurlant/crypto/tests/ECBModeTest.as +++ b/flash-src/third-party/com/hurlant/crypto/tests/ECBModeTest.as diff --git a/flash-src/com/hurlant/crypto/tests/HMACTest.as b/flash-src/third-party/com/hurlant/crypto/tests/HMACTest.as index 340293f..340293f 100755 --- a/flash-src/com/hurlant/crypto/tests/HMACTest.as +++ b/flash-src/third-party/com/hurlant/crypto/tests/HMACTest.as diff --git a/flash-src/com/hurlant/crypto/tests/ITestHarness.as b/flash-src/third-party/com/hurlant/crypto/tests/ITestHarness.as index 3a8daab..3a8daab 100755 --- a/flash-src/com/hurlant/crypto/tests/ITestHarness.as +++ b/flash-src/third-party/com/hurlant/crypto/tests/ITestHarness.as diff --git a/flash-src/com/hurlant/crypto/tests/MD2Test.as b/flash-src/third-party/com/hurlant/crypto/tests/MD2Test.as index 8b4106a..8b4106a 100755 --- a/flash-src/com/hurlant/crypto/tests/MD2Test.as +++ b/flash-src/third-party/com/hurlant/crypto/tests/MD2Test.as diff --git a/flash-src/com/hurlant/crypto/tests/MD5Test.as b/flash-src/third-party/com/hurlant/crypto/tests/MD5Test.as index 14c3f2f..14c3f2f 100755 --- a/flash-src/com/hurlant/crypto/tests/MD5Test.as +++ b/flash-src/third-party/com/hurlant/crypto/tests/MD5Test.as diff --git a/flash-src/com/hurlant/crypto/tests/OFBModeTest.as b/flash-src/third-party/com/hurlant/crypto/tests/OFBModeTest.as index 979d20b..979d20b 100755 --- a/flash-src/com/hurlant/crypto/tests/OFBModeTest.as +++ b/flash-src/third-party/com/hurlant/crypto/tests/OFBModeTest.as diff --git a/flash-src/com/hurlant/crypto/tests/RSAKeyTest.as b/flash-src/third-party/com/hurlant/crypto/tests/RSAKeyTest.as index 6ada0fc..6ada0fc 100755 --- a/flash-src/com/hurlant/crypto/tests/RSAKeyTest.as +++ b/flash-src/third-party/com/hurlant/crypto/tests/RSAKeyTest.as diff --git a/flash-src/com/hurlant/crypto/tests/SHA1Test.as b/flash-src/third-party/com/hurlant/crypto/tests/SHA1Test.as index dc216f9..dc216f9 100755 --- a/flash-src/com/hurlant/crypto/tests/SHA1Test.as +++ b/flash-src/third-party/com/hurlant/crypto/tests/SHA1Test.as diff --git a/flash-src/com/hurlant/crypto/tests/SHA224Test.as b/flash-src/third-party/com/hurlant/crypto/tests/SHA224Test.as index 12208a8..12208a8 100755 --- a/flash-src/com/hurlant/crypto/tests/SHA224Test.as +++ b/flash-src/third-party/com/hurlant/crypto/tests/SHA224Test.as diff --git a/flash-src/com/hurlant/crypto/tests/SHA256Test.as b/flash-src/third-party/com/hurlant/crypto/tests/SHA256Test.as index a2b4c6c..a2b4c6c 100755 --- a/flash-src/com/hurlant/crypto/tests/SHA256Test.as +++ b/flash-src/third-party/com/hurlant/crypto/tests/SHA256Test.as diff --git a/flash-src/com/hurlant/crypto/tests/TLSPRFTest.as b/flash-src/third-party/com/hurlant/crypto/tests/TLSPRFTest.as index 07fe9c6..07fe9c6 100755 --- a/flash-src/com/hurlant/crypto/tests/TLSPRFTest.as +++ b/flash-src/third-party/com/hurlant/crypto/tests/TLSPRFTest.as diff --git a/flash-src/com/hurlant/crypto/tests/TestCase.as b/flash-src/third-party/com/hurlant/crypto/tests/TestCase.as index 4be402b..4be402b 100755 --- a/flash-src/com/hurlant/crypto/tests/TestCase.as +++ b/flash-src/third-party/com/hurlant/crypto/tests/TestCase.as diff --git a/flash-src/com/hurlant/crypto/tests/TripleDESKeyTest.as b/flash-src/third-party/com/hurlant/crypto/tests/TripleDESKeyTest.as index 148451f..148451f 100755 --- a/flash-src/com/hurlant/crypto/tests/TripleDESKeyTest.as +++ b/flash-src/third-party/com/hurlant/crypto/tests/TripleDESKeyTest.as diff --git a/flash-src/com/hurlant/crypto/tests/XTeaKeyTest.as b/flash-src/third-party/com/hurlant/crypto/tests/XTeaKeyTest.as index 90a0b48..90a0b48 100755 --- a/flash-src/com/hurlant/crypto/tests/XTeaKeyTest.as +++ b/flash-src/third-party/com/hurlant/crypto/tests/XTeaKeyTest.as diff --git a/flash-src/com/hurlant/crypto/tls/BulkCiphers.as b/flash-src/third-party/com/hurlant/crypto/tls/BulkCiphers.as index 2b1e717..2b1e717 100644 --- a/flash-src/com/hurlant/crypto/tls/BulkCiphers.as +++ b/flash-src/third-party/com/hurlant/crypto/tls/BulkCiphers.as diff --git a/flash-src/com/hurlant/crypto/tls/CipherSuites.as b/flash-src/third-party/com/hurlant/crypto/tls/CipherSuites.as index e9beb0a..e9beb0a 100644 --- a/flash-src/com/hurlant/crypto/tls/CipherSuites.as +++ b/flash-src/third-party/com/hurlant/crypto/tls/CipherSuites.as diff --git a/flash-src/com/hurlant/crypto/tls/IConnectionState.as b/flash-src/third-party/com/hurlant/crypto/tls/IConnectionState.as index a5f0e11..a5f0e11 100644 --- a/flash-src/com/hurlant/crypto/tls/IConnectionState.as +++ b/flash-src/third-party/com/hurlant/crypto/tls/IConnectionState.as diff --git a/flash-src/com/hurlant/crypto/tls/ISecurityParameters.as b/flash-src/third-party/com/hurlant/crypto/tls/ISecurityParameters.as index 3c18aa3..3c18aa3 100755 --- a/flash-src/com/hurlant/crypto/tls/ISecurityParameters.as +++ b/flash-src/third-party/com/hurlant/crypto/tls/ISecurityParameters.as diff --git a/flash-src/com/hurlant/crypto/tls/KeyExchanges.as b/flash-src/third-party/com/hurlant/crypto/tls/KeyExchanges.as index 8b9fd0d..8b9fd0d 100644 --- a/flash-src/com/hurlant/crypto/tls/KeyExchanges.as +++ b/flash-src/third-party/com/hurlant/crypto/tls/KeyExchanges.as diff --git a/flash-src/com/hurlant/crypto/tls/MACs.as b/flash-src/third-party/com/hurlant/crypto/tls/MACs.as index 09d79e7..09d79e7 100644 --- a/flash-src/com/hurlant/crypto/tls/MACs.as +++ b/flash-src/third-party/com/hurlant/crypto/tls/MACs.as diff --git a/flash-src/com/hurlant/crypto/tls/SSLConnectionState.as b/flash-src/third-party/com/hurlant/crypto/tls/SSLConnectionState.as index 1ef9c38..1ef9c38 100644 --- a/flash-src/com/hurlant/crypto/tls/SSLConnectionState.as +++ b/flash-src/third-party/com/hurlant/crypto/tls/SSLConnectionState.as diff --git a/flash-src/com/hurlant/crypto/tls/SSLEvent.as b/flash-src/third-party/com/hurlant/crypto/tls/SSLEvent.as index 9a63521..9a63521 100755 --- a/flash-src/com/hurlant/crypto/tls/SSLEvent.as +++ b/flash-src/third-party/com/hurlant/crypto/tls/SSLEvent.as diff --git a/flash-src/com/hurlant/crypto/tls/SSLSecurityParameters.as b/flash-src/third-party/com/hurlant/crypto/tls/SSLSecurityParameters.as index 3549461..3549461 100755 --- a/flash-src/com/hurlant/crypto/tls/SSLSecurityParameters.as +++ b/flash-src/third-party/com/hurlant/crypto/tls/SSLSecurityParameters.as diff --git a/flash-src/com/hurlant/crypto/tls/TLSConfig.as b/flash-src/third-party/com/hurlant/crypto/tls/TLSConfig.as index 2cd1d27..2cd1d27 100644 --- a/flash-src/com/hurlant/crypto/tls/TLSConfig.as +++ b/flash-src/third-party/com/hurlant/crypto/tls/TLSConfig.as diff --git a/flash-src/com/hurlant/crypto/tls/TLSConnectionState.as b/flash-src/third-party/com/hurlant/crypto/tls/TLSConnectionState.as index 0d09a6c..0d09a6c 100644 --- a/flash-src/com/hurlant/crypto/tls/TLSConnectionState.as +++ b/flash-src/third-party/com/hurlant/crypto/tls/TLSConnectionState.as diff --git a/flash-src/com/hurlant/crypto/tls/TLSEngine.as b/flash-src/third-party/com/hurlant/crypto/tls/TLSEngine.as index 72f3941..72f3941 100644 --- a/flash-src/com/hurlant/crypto/tls/TLSEngine.as +++ b/flash-src/third-party/com/hurlant/crypto/tls/TLSEngine.as diff --git a/flash-src/com/hurlant/crypto/tls/TLSError.as b/flash-src/third-party/com/hurlant/crypto/tls/TLSError.as index 16fac6d..16fac6d 100644 --- a/flash-src/com/hurlant/crypto/tls/TLSError.as +++ b/flash-src/third-party/com/hurlant/crypto/tls/TLSError.as diff --git a/flash-src/com/hurlant/crypto/tls/TLSEvent.as b/flash-src/third-party/com/hurlant/crypto/tls/TLSEvent.as index d988d1e..d988d1e 100644 --- a/flash-src/com/hurlant/crypto/tls/TLSEvent.as +++ b/flash-src/third-party/com/hurlant/crypto/tls/TLSEvent.as diff --git a/flash-src/com/hurlant/crypto/tls/TLSSecurityParameters.as b/flash-src/third-party/com/hurlant/crypto/tls/TLSSecurityParameters.as index 2637811..2637811 100644 --- a/flash-src/com/hurlant/crypto/tls/TLSSecurityParameters.as +++ b/flash-src/third-party/com/hurlant/crypto/tls/TLSSecurityParameters.as diff --git a/flash-src/com/hurlant/crypto/tls/TLSSocket.as b/flash-src/third-party/com/hurlant/crypto/tls/TLSSocket.as index 10004a7..10004a7 100644 --- a/flash-src/com/hurlant/crypto/tls/TLSSocket.as +++ b/flash-src/third-party/com/hurlant/crypto/tls/TLSSocket.as diff --git a/flash-src/com/hurlant/crypto/tls/TLSSocketEvent.as b/flash-src/third-party/com/hurlant/crypto/tls/TLSSocketEvent.as index c38f0dc..c38f0dc 100644 --- a/flash-src/com/hurlant/crypto/tls/TLSSocketEvent.as +++ b/flash-src/third-party/com/hurlant/crypto/tls/TLSSocketEvent.as diff --git a/flash-src/com/hurlant/crypto/tls/TLSTest.as b/flash-src/third-party/com/hurlant/crypto/tls/TLSTest.as index d7c70f3..d7c70f3 100644 --- a/flash-src/com/hurlant/crypto/tls/TLSTest.as +++ b/flash-src/third-party/com/hurlant/crypto/tls/TLSTest.as diff --git a/flash-src/com/hurlant/math/BarrettReduction.as b/flash-src/third-party/com/hurlant/math/BarrettReduction.as index 48d1563..48d1563 100755 --- a/flash-src/com/hurlant/math/BarrettReduction.as +++ b/flash-src/third-party/com/hurlant/math/BarrettReduction.as diff --git a/flash-src/com/hurlant/math/BigInteger.as b/flash-src/third-party/com/hurlant/math/BigInteger.as index 119db17..119db17 100644 --- a/flash-src/com/hurlant/math/BigInteger.as +++ b/flash-src/third-party/com/hurlant/math/BigInteger.as diff --git a/flash-src/com/hurlant/math/ClassicReduction.as b/flash-src/third-party/com/hurlant/math/ClassicReduction.as index ea9f17c..ea9f17c 100755 --- a/flash-src/com/hurlant/math/ClassicReduction.as +++ b/flash-src/third-party/com/hurlant/math/ClassicReduction.as diff --git a/flash-src/com/hurlant/math/IReduction.as b/flash-src/third-party/com/hurlant/math/IReduction.as index 210a054..210a054 100755 --- a/flash-src/com/hurlant/math/IReduction.as +++ b/flash-src/third-party/com/hurlant/math/IReduction.as diff --git a/flash-src/com/hurlant/math/MontgomeryReduction.as b/flash-src/third-party/com/hurlant/math/MontgomeryReduction.as index 47a16d6..47a16d6 100755 --- a/flash-src/com/hurlant/math/MontgomeryReduction.as +++ b/flash-src/third-party/com/hurlant/math/MontgomeryReduction.as diff --git a/flash-src/com/hurlant/math/NullReduction.as b/flash-src/third-party/com/hurlant/math/NullReduction.as index 5b55832..5b55832 100755 --- a/flash-src/com/hurlant/math/NullReduction.as +++ b/flash-src/third-party/com/hurlant/math/NullReduction.as diff --git a/flash-src/com/hurlant/math/bi_internal.as b/flash-src/third-party/com/hurlant/math/bi_internal.as index dc86aad..dc86aad 100755 --- a/flash-src/com/hurlant/math/bi_internal.as +++ b/flash-src/third-party/com/hurlant/math/bi_internal.as diff --git a/flash-src/com/hurlant/util/ArrayUtil.as b/flash-src/third-party/com/hurlant/util/ArrayUtil.as index b02b8d5..b02b8d5 100755 --- a/flash-src/com/hurlant/util/ArrayUtil.as +++ b/flash-src/third-party/com/hurlant/util/ArrayUtil.as diff --git a/flash-src/com/hurlant/util/Base64.as b/flash-src/third-party/com/hurlant/util/Base64.as index bcb349c..bcb349c 100755 --- a/flash-src/com/hurlant/util/Base64.as +++ b/flash-src/third-party/com/hurlant/util/Base64.as diff --git a/flash-src/com/hurlant/util/Hex.as b/flash-src/third-party/com/hurlant/util/Hex.as index 98d887b..98d887b 100755 --- a/flash-src/com/hurlant/util/Hex.as +++ b/flash-src/third-party/com/hurlant/util/Hex.as diff --git a/flash-src/com/hurlant/util/Memory.as b/flash-src/third-party/com/hurlant/util/Memory.as index 688e1bc..688e1bc 100755 --- a/flash-src/com/hurlant/util/Memory.as +++ b/flash-src/third-party/com/hurlant/util/Memory.as diff --git a/flash-src/com/hurlant/util/der/ByteString.as b/flash-src/third-party/com/hurlant/util/der/ByteString.as index fb8b280..fb8b280 100755 --- a/flash-src/com/hurlant/util/der/ByteString.as +++ b/flash-src/third-party/com/hurlant/util/der/ByteString.as diff --git a/flash-src/com/hurlant/util/der/DER.as b/flash-src/third-party/com/hurlant/util/der/DER.as index bb5ecce..bb5ecce 100755 --- a/flash-src/com/hurlant/util/der/DER.as +++ b/flash-src/third-party/com/hurlant/util/der/DER.as diff --git a/flash-src/com/hurlant/util/der/IAsn1Type.as b/flash-src/third-party/com/hurlant/util/der/IAsn1Type.as index f4f2112..f4f2112 100755 --- a/flash-src/com/hurlant/util/der/IAsn1Type.as +++ b/flash-src/third-party/com/hurlant/util/der/IAsn1Type.as diff --git a/flash-src/com/hurlant/util/der/Integer.as b/flash-src/third-party/com/hurlant/util/der/Integer.as index e2f045c..e2f045c 100755 --- a/flash-src/com/hurlant/util/der/Integer.as +++ b/flash-src/third-party/com/hurlant/util/der/Integer.as diff --git a/flash-src/com/hurlant/util/der/OID.as b/flash-src/third-party/com/hurlant/util/der/OID.as index 4d43d95..4d43d95 100755 --- a/flash-src/com/hurlant/util/der/OID.as +++ b/flash-src/third-party/com/hurlant/util/der/OID.as diff --git a/flash-src/com/hurlant/util/der/ObjectIdentifier.as b/flash-src/third-party/com/hurlant/util/der/ObjectIdentifier.as index 932acd7..932acd7 100755 --- a/flash-src/com/hurlant/util/der/ObjectIdentifier.as +++ b/flash-src/third-party/com/hurlant/util/der/ObjectIdentifier.as diff --git a/flash-src/com/hurlant/util/der/PEM.as b/flash-src/third-party/com/hurlant/util/der/PEM.as index 5693e76..5693e76 100755 --- a/flash-src/com/hurlant/util/der/PEM.as +++ b/flash-src/third-party/com/hurlant/util/der/PEM.as diff --git a/flash-src/com/hurlant/util/der/PrintableString.as b/flash-src/third-party/com/hurlant/util/der/PrintableString.as index ed1775e..ed1775e 100755 --- a/flash-src/com/hurlant/util/der/PrintableString.as +++ b/flash-src/third-party/com/hurlant/util/der/PrintableString.as diff --git a/flash-src/com/hurlant/util/der/Sequence.as b/flash-src/third-party/com/hurlant/util/der/Sequence.as index c352414..c352414 100755 --- a/flash-src/com/hurlant/util/der/Sequence.as +++ b/flash-src/third-party/com/hurlant/util/der/Sequence.as diff --git a/flash-src/com/hurlant/util/der/Set.as b/flash-src/third-party/com/hurlant/util/der/Set.as index c0bfa47..c0bfa47 100755 --- a/flash-src/com/hurlant/util/der/Set.as +++ b/flash-src/third-party/com/hurlant/util/der/Set.as diff --git a/flash-src/com/hurlant/util/der/Type.as b/flash-src/third-party/com/hurlant/util/der/Type.as index 3dc6dcd..3dc6dcd 100755 --- a/flash-src/com/hurlant/util/der/Type.as +++ b/flash-src/third-party/com/hurlant/util/der/Type.as diff --git a/flash-src/com/hurlant/util/der/UTCTime.as b/flash-src/third-party/com/hurlant/util/der/UTCTime.as index 4e49686..4e49686 100755 --- a/flash-src/com/hurlant/util/der/UTCTime.as +++ b/flash-src/third-party/com/hurlant/util/der/UTCTime.as diff --git a/web_socket.js b/web_socket.js index 8503cc2..6cbafd5 100644 --- a/web_socket.js +++ b/web_socket.js @@ -51,8 +51,9 @@ } // Uses setTimeout() to make sure __createFlash() runs after the caller sets ws.onopen etc. // Otherwise, when onopen fires immediately, onopen is called before it is set. - setTimeout(function() { + self.__createTask = setTimeout(function() { WebSocket.__addTask(function() { + self.__createTask = null; WebSocket.__flash.create( self.__id, url, protocols, proxyHost || null, proxyPort || 0, headers || null); }); @@ -89,6 +90,12 @@ * Close this web socket gracefully. */ WebSocket.prototype.close = function() { + if (this.__createTask) { + clearTimeout(this.__createTask); + this.__createTask = null; + this.readyState = WebSocket.CLOSED; + return; + } if (this.readyState == WebSocket.CLOSED || this.readyState == WebSocket.CLOSING) { return; } @@ -142,7 +149,7 @@ events[i](event); } var handler = this["on" + event.type]; - if (handler) handler(event); + if (handler) handler.apply(this, [event]); }; /** |