Commit ad158f78 authored by Matt Perry's avatar Matt Perry

Merge pull request #1996 from mpcomplete/pointy

Use pointycastle as crypto library. cipher is deprecated.
parents 65e01acc 0e92d900
...@@ -9,11 +9,10 @@ import 'dart:typed_data'; ...@@ -9,11 +9,10 @@ import 'dart:typed_data';
import 'package:asn1lib/asn1lib.dart'; import 'package:asn1lib/asn1lib.dart';
import 'package:bignum/bignum.dart'; import 'package:bignum/bignum.dart';
import 'package:cipher/cipher.dart'; import 'package:pointycastle/pointycastle.dart';
import 'package:cipher/impl/client.dart';
import 'package:crypto/crypto.dart'; import 'package:crypto/crypto.dart';
export 'package:cipher/cipher.dart' show AsymmetricKeyPair; export 'package:pointycastle/pointycastle.dart' show AsymmetricKeyPair;
// The ECDSA algorithm parameters we're using. These match the parameters used // The ECDSA algorithm parameters we're using. These match the parameters used
// by the Flutter updater package. // by the Flutter updater package.
...@@ -29,7 +28,7 @@ class CipherParameters { ...@@ -29,7 +28,7 @@ class CipherParameters {
// Seeds our secure random number generator using data from /dev/urandom. // Seeds our secure random number generator using data from /dev/urandom.
// Disclaimer: I don't really understand why we need 2 parameters for // Disclaimer: I don't really understand why we need 2 parameters for
// cipher's API. // pointycastle's API.
Future seedRandom() async { Future seedRandom() async {
try { try {
RandomAccessFile file = await new File("/dev/urandom").open(); RandomAccessFile file = await new File("/dev/urandom").open();
...@@ -53,7 +52,6 @@ class CipherParameters { ...@@ -53,7 +52,6 @@ class CipherParameters {
static CipherParameters get() => _params; static CipherParameters get() => _params;
static CipherParameters _init() { static CipherParameters _init() {
initCipher();
return new CipherParameters(); return new CipherParameters();
} }
} }
......
...@@ -4,9 +4,9 @@ author: Flutter Authors <flutter-dev@googlegroups.com> ...@@ -4,9 +4,9 @@ author: Flutter Authors <flutter-dev@googlegroups.com>
description: Library for dealing with Flutter bundle (.flx) files description: Library for dealing with Flutter bundle (.flx) files
homepage: https://github.com/flutter/flutter/tree/master/packages/flx homepage: https://github.com/flutter/flutter/tree/master/packages/flx
dependencies: dependencies:
bignum: ^0.0.7 bignum: ^0.1.0
asn1lib: ^0.4.1 asn1lib: ^0.4.1
cipher: ^0.7.1 pointycastle: 0.10.0
crypto: ^0.9.1 crypto: ^0.9.1
environment: environment:
......
...@@ -3,7 +3,7 @@ import 'dart:convert' hide BASE64; ...@@ -3,7 +3,7 @@ import 'dart:convert' hide BASE64;
import 'dart:typed_data'; import 'dart:typed_data';
import 'package:bignum/bignum.dart'; import 'package:bignum/bignum.dart';
import 'package:cipher/cipher.dart' hide CipherParameters; import 'package:pointycastle/pointycastle.dart' hide CipherParameters;
import 'package:crypto/crypto.dart'; import 'package:crypto/crypto.dart';
import 'package:flx/signing.dart'; import 'package:flx/signing.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment