Skip to content

Update to crypto v1.1.1 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
areiter wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update to crypto v1.1.1 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3905676
Update to crypto v1.1.1
May 31, 2016
489a681
Error in transforming (2<<31)-1 to js via dart2js, inserted static value
Jun 22, 2016
5cbe2e3
Update crypto to 2.0.0
May 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 31 additions & 21 deletions lib/pbkdf2.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
library pbkdf2;

import 'package:crypto/crypto.dart';
import 'dart:async';

class PBKDF2 {
Hash hash;
List<int> _blockList = new List<int>(4);

PBKDF2({Hash this.hash});

List<int> generateKey(String password, String salt, int c, int dkLen) {
var PRF = hash.newInstance();
PRF.add([1, 2, 3]);
var blockSize = PRF.close().length;
if (dkLen > ((2 << 31) - 1) * blockSize) {
throw "derived key too long";
Future<List<int>> generateKey(String password, String salt, int c, int dkLen) async {

var digestSize = hash.convert([1,2,3]).bytes.length;

if (dkLen > (4294967295 /*(2<<31)-1*/) * digestSize) {
return new Future.error("derived key too long");
}

var numberOfBlocks = (dkLen / blockSize).ceil();
var sizeOfLastBlock = dkLen - (numberOfBlocks - 1) * blockSize;
var numberOfBlocks = (dkLen / digestSize).ceil();
var sizeOfLastBlock = dkLen - (numberOfBlocks - 1) * digestSize;

var key = [];
for (var i = 1; i <= numberOfBlocks; i++) {
var block = _computeBlock(password, salt, c, i);
var block = await _computeBlock(password, salt, c, i);
if (i < numberOfBlocks) {
key.addAll(block);
} else {
Expand All @@ -31,28 +32,37 @@ class PBKDF2 {
return key;
}

List<int> _computeBlock(String password, String salt, int iterations, int blockNumber) {
var hmac = new HMAC(hash, password.codeUnits);
hmac.add(salt.codeUnits);
_writeBlockNumber(hmac, blockNumber);
var lastDigest = hmac.close();
var result = lastDigest;
Future<List<int>> _computeBlock(String password, String salt, int iterations, int blockNumber) async {
var hmac = new Hmac(hash, password.codeUnits);
var digestStream = new StreamController<Digest>();
var hmacSink = hmac.startChunkedConversion(digestStream);

hmacSink.add(salt.codeUnits);
_writeBlockNumber(hmacSink, blockNumber);
hmacSink.close();
var lastDigest = await digestStream.stream.first;

var result = lastDigest.bytes;
for (var i = 1; i < iterations; i++) {
hmac = new HMAC(hash, password.codeUnits);
hmac.add(lastDigest);
var newDigest = hmac.close();
_xorLists(result, newDigest);
hmac = new Hmac(hash, password.codeUnits);
digestStream = new StreamController<Digest>();
hmacSink = hmac.startChunkedConversion(digestStream);
hmacSink.add(lastDigest.bytes);
hmacSink.close();

var newDigest = await digestStream.stream.first;
_xorLists(result, newDigest.bytes);
lastDigest = newDigest;
}
return result;
}

_writeBlockNumber(HMAC hmac, int blockNumber) {
_writeBlockNumber(var hmacSink, int blockNumber) {
_blockList[0] = blockNumber >> 24;
_blockList[1] = blockNumber >> 16;
_blockList[2] = blockNumber >> 8;
_blockList[3] = blockNumber;
hmac.add(_blockList);
hmacSink.add(_blockList);
}

_xorLists(List<int> list1, List<int> list2) {
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ author: James Ots <code@jamesots.com>
homepage: https://github.com/jamesots/pbkdf2
description: Implementation of PBKDF2 key derivation function
dependencies:
crypto: ">=0.9.0 <0.10.0"
crypto: '^2.0.0'
dev_dependencies:
unittest: ">=0.10.0 <0.11.0"
55 changes: 30 additions & 25 deletions test/pbkdf2_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:pbkdf2/pbkdf2.dart';
import 'package:unittest/unittest.dart';
import 'package:crypto/crypto.dart';
import 'package:crypto/crypto.dart' as crypto;

List<int> encodeBytes(String bytes) {
var byteList = bytes.split(" ");
Expand All @@ -13,48 +13,53 @@ List<int> encodeBytes(String bytes) {

main() {
group("PBKDF2", () {
test("Should disallow large values of dkLen", () {
var sha = new SHA1();
sha.add([1]);
var hLen = sha.close().length;
var gen = new PBKDF2(hash: sha);
expect(() => gen.generateKey("password", "salt", 1, ((2 << 31) - 1) * hLen + 1), throws);
test("Should disallow large values of dkLen", () async {
var digestSize = crypto.sha1.convert([1,2,3]).bytes.length;
var gen = new PBKDF2(hash: crypto.sha1);

expect(gen.generateKey("password", "salt", 1, ((2 << 31) - 1) * digestSize + 1), throws);

});

test("Should work with RFC6070 test vectors 1", () {
var gen = new PBKDF2(hash: new SHA1());
var output = gen.generateKey("password", "salt", 1, 20);
test("Should work with RFC6070 test vectors 1", () async {
var gen = new PBKDF2(hash: crypto.sha1);
var output = await gen.generateKey("password", "salt", 1, 20);
expect(output, encodeBytes("0c 60 c8 0f 96 1f 0e 71 f3 a9 b5 24 af 60 12 06 2f e0 37 a6"));
});

test("Should work with RFC6070 test vectors 2", () {
var gen = new PBKDF2(hash: new SHA1());
var output = gen.generateKey("password", "salt", 2, 20);

test("Should work with RFC6070 test vectors 2", () async {
var gen = new PBKDF2(hash: crypto.sha1);
var output = await gen.generateKey("password", "salt", 2, 20);
expect(output, encodeBytes("ea 6c 01 4d c7 2d 6f 8c cd 1e d9 2a ce 1d 41 f0 d8 de 89 57"));
});

test("Should work with RFC6070 test vectors 3", () {
var gen = new PBKDF2(hash: new SHA1());
var output = gen.generateKey("password", "salt", 4096, 20);

test("Should work with RFC6070 test vectors 3", () async {
var gen = new PBKDF2(hash: crypto.sha1);
var output = await gen.generateKey("password", "salt", 4096, 20);
expect(output, encodeBytes("4b 00 79 01 b7 65 48 9a be ad 49 d9 26 f7 21 d0 65 a4 29 c1"));
});


// This test may take a few minutes to run
test("Should work with RFC6070 test vectors 4", () {
var gen = new PBKDF2(hash: new SHA1());
var output = gen.generateKey("password", "salt", 16777216, 20);
test("Should work with RFC6070 test vectors 4", () async {
var gen = new PBKDF2(hash: crypto.sha1);
var output = await gen.generateKey("password", "salt", 16777216, 20);
expect(output, encodeBytes("ee fe 3d 61 cd 4d a4 e4 e9 94 5b 3d 6b a2 15 8c 26 34 e9 84"));
});



test("Should work with RFC6070 test vectors 5", () {
var gen = new PBKDF2(hash: new SHA1());
var output = gen.generateKey("passwordPASSWORDpassword", "saltSALTsaltSALTsaltSALTsaltSALTsalt", 4096, 25);
test("Should work with RFC6070 test vectors 5", () async {
var gen = new PBKDF2(hash: crypto.sha1);
var output = await gen.generateKey("passwordPASSWORDpassword", "saltSALTsaltSALTsaltSALTsaltSALTsalt", 4096, 25);
expect(output, encodeBytes("3d 2e ec 4f e4 1c 84 9b 80 c8 d8 36 62 c0 e4 4a 8b 29 1a 96 4c f2 f0 70 38"));
});

test("Should work with RFC6070 test vectors 6", () {
var gen = new PBKDF2(hash: new SHA1());
var output = gen.generateKey("pass\u0000word", "sa\u0000lt", 4096, 16);
test("Should work with RFC6070 test vectors 6", () async {
var gen = new PBKDF2(hash: crypto.sha1);
var output = await gen.generateKey("pass\u0000word", "sa\u0000lt", 4096, 16);
expect(output, encodeBytes("56 fa 6a a7 55 48 09 9d cc 37 d7 f0 34 25 e0 c3"));
});
});
Expand Down