Add support for crypto 1.0.0.. R=kevmoo@google.com Review URL: https://codereview.chromium.org//1823123003 .
diff --git a/pkgs/web_socket_channel/CHANGELOG.md b/pkgs/web_socket_channel/CHANGELOG.md index 3149059..a74290e 100644 --- a/pkgs/web_socket_channel/CHANGELOG.md +++ b/pkgs/web_socket_channel/CHANGELOG.md
@@ -1,3 +1,7 @@ +## 1.0.1 + +* Add support for `crypto` 1.0.0. + ## 1.0.0 * Initial version
diff --git a/pkgs/web_socket_channel/lib/src/channel.dart b/pkgs/web_socket_channel/lib/src/channel.dart index 446eb69..3d1d492 100644 --- a/pkgs/web_socket_channel/lib/src/channel.dart +++ b/pkgs/web_socket_channel/lib/src/channel.dart
@@ -62,11 +62,9 @@ /// /// [initial handshake]: https://tools.ietf.org/html/rfc6455#section-4.2.2 static String signKey(String key) { - var hash = new SHA1(); // We use [codeUnits] here rather than UTF-8-decoding the string because // [key] is expected to be base64 encoded, and so will be pure ASCII. - hash.add((key + webSocketGUID).codeUnits); - return CryptoUtils.bytesToBase64(hash.close()); + return BASE64.encode(sha1.convert((key + webSocketGUID).codeUnits).bytes); } /// Creates a new WebSocket handling messaging across an existing [channel].
diff --git a/pkgs/web_socket_channel/pubspec.yaml b/pkgs/web_socket_channel/pubspec.yaml index f7b58e5..a4853c9 100644 --- a/pkgs/web_socket_channel/pubspec.yaml +++ b/pkgs/web_socket_channel/pubspec.yaml
@@ -1,5 +1,5 @@ name: web_socket_channel -version: 1.0.0 +version: 1.0.1 description: StreamChannel wrappers for WebSockets. author: Dart Team <misc@dartlang.org> homepage: https://github.com/dart-lang/web_socket_channel @@ -9,7 +9,7 @@ dependencies: async: '^1.3.0' - crypto: '^0.9.0' + crypto: '>=0.9.2 <2.0.0' stream_channel: '^1.2.0' dev_dependencies: