Skip to content

Commit fe42a34

Browse files
jonasfjjonasfj
authored
Merge pull request dart-archive/crypto#71 from jtmcdole/fixHmac512
Update SHA-384/512 Blocksize + Test
2 parents e442072 + 1a69c58 commit fe42a34

File tree

6 files changed

+148
-11
lines changed

6 files changed

+148
-11
lines changed

‎pkgs/crypto/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 2.1.2
2+
* Fix bug in SHA-2 384/512 blocksize.
3+
* Added HMAC-SHA-2 test vectors
4+
15
## 2.1.1+1
26
* Bump version number for publish mishap (spare file uploaded with `pub
37
publish`).

‎pkgs/crypto/lib/src/sha512.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ final sha512 = Sha512._();
3232
/// new instance.
3333
class Sha384 extends Hash {
3434
@override
35-
final int blockSize = 16 * bytesPerWord;
35+
final int blockSize = 32 * bytesPerWord;
3636

3737
Sha384._();
3838

‎pkgs/crypto/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: crypto
2-
version: 2.1.1+1
2+
version: 2.1.2
33
author: Dart Team <misc@dartlang.org>
44
description: Library of cryptographic functions.
55
homepage: https://www.github.com/dart-lang/crypto

‎pkgs/crypto/test/hmac_sha2_test.dart

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
2+
// for details. All rights reserved. Use of this source code is governed by a
3+
// BSD-style license that can be found in the LICENSE file.
4+
5+
// Library tag to allow the test to run on Dartium.
6+
import 'package:crypto/crypto.dart';
7+
import 'package:test/test.dart';
8+
9+
import 'utils.dart';
10+
11+
void main() {
12+
group('rfc4231 vectors', () {
13+
testCase(
14+
name: 'Test Case 1',
15+
key: '0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b',
16+
data: '4869205468657265',
17+
hmacSha224: '896fb1128abbdf196832107cd49df33f47b4b1169912ba4f53684b22',
18+
hmacSha256:
19+
'b0344c61d8db38535ca8afceaf0bf12b881dc200c9833da726e9376c2e32cff7',
20+
hmacSha384:
21+
'afd03944d84895626b0825f4ab46907f15f9dadbe4101ec682aa034c7cebc59cfaea9ea9076ede7f4af152e8b2fa9cb6',
22+
hmacSha512:
23+
'87aa7cdea5ef619d4ff0b4241a1d6cb02379f4e2ce4ec2787ad0b30545e17cdedaa833b7d6b8a702038b274eaea3f4e4be9d914eeb61f1702e696c203a126854',
24+
);
25+
testCase(
26+
name: 'Test Case 2',
27+
key: '4a656665',
28+
data: '7768617420646f2079612077616e7420666f72206e6f7468696e673f',
29+
hmacSha224: 'a30e01098bc6dbbf45690f3a7e9e6d0f8bbea2a39e6148008fd05e44',
30+
hmacSha256:
31+
'5bdcc146bf60754e6a042426089575c75a003f089d2739839dec58b964ec3843',
32+
hmacSha384:
33+
'af45d2e376484031617f78d2b58a6b1b9c7ef464f5a01b47e42ec3736322445e8e2240ca5e69e2c78b3239ecfab21649',
34+
hmacSha512:
35+
'164b7a7bfcf819e2e395fbe73b56e0a387bd64222e831fd610270cd7ea2505549758bf75c05a994a6d034f65f8f0e6fdcaeab1a34d4a6b4b636e070a38bce737',
36+
);
37+
testCase(
38+
name: 'Test Case 3',
39+
key: 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
40+
data:
41+
'dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd',
42+
hmacSha224: '7fb3cb3588c6c1f6ffa9694d7d6ad2649365b0c1f65d69d1ec8333ea',
43+
hmacSha256:
44+
'773ea91e36800e46854db8ebd09181a72959098b3ef8c122d9635514ced565fe',
45+
hmacSha384:
46+
'88062608d3e6ad8a0aa2ace014c8a86f0aa635d947ac9febe83ef4e55966144b2a5ab39dc13814b94e3ab6e101a34f27',
47+
hmacSha512:
48+
'fa73b0089d56a284efb0f0756c890be9b1b5dbdd8ee81a3655f83e33b2279d39bf3e848279a722c806b485a47e67c807b946a337bee8942674278859e13292fb',
49+
);
50+
testCase(
51+
name: 'Test Case 4',
52+
key: '0102030405060708090a0b0c0d0e0f10111213141516171819',
53+
data:
54+
'cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd',
55+
hmacSha224: '6c11506874013cac6a2abc1bb382627cec6a90d86efc012de7afec5a',
56+
hmacSha256:
57+
'82558a389a443c0ea4cc819899f2083a85f0faa3e578f8077a2e3ff46729665b',
58+
hmacSha384:
59+
'3e8a69b7783c25851933ab6290af6ca77a9981480850009cc5577c6e1f573b4e6801dd23c4a7d679ccf8a386c674cffb',
60+
hmacSha512:
61+
'b0ba465637458c6990e5a8c5f61d4af7e576d97ff94b872de76f8050361ee3dba91ca5c11aa25eb4d679275cc5788063a5f19741120c4f2de2adebeb10a298dd',
62+
);
63+
testCase(
64+
name: 'Test Case 5',
65+
key: '0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c',
66+
data: '546573742057697468205472756e636174696f6e',
67+
hmacSha224: '0e2aea68a90c8d37c988bcdb9fca6fa8',
68+
hmacSha256: 'a3b6167473100ee06e0c796c2955552b',
69+
hmacSha384: '3abf34c3503b2a23a46efc619baef897',
70+
hmacSha512: '415fad6271580a531d4179bc891d87a6',
71+
truncation: true,
72+
);
73+
74+
testCase(
75+
name: 'Test Case 6',
76+
key:
77+
'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
78+
data:
79+
'54657374205573696e67204c6172676572205468616e20426c6f636b2d53697a65204b6579202d2048617368204b6579204669727374',
80+
hmacSha224: '95e9a0db962095adaebe9b2d6f0dbce2d499f112f2d2b7273fa6870e',
81+
hmacSha256:
82+
'60e431591ee0b67f0d8a26aacbf5b77f8e0bc6213728c5140546040f0ee37f54',
83+
hmacSha384:
84+
'4ece084485813e9088d2c63a041bc5b44f9ef1012a2b588f3cd11f05033ac4c60c2ef6ab4030fe8296248df163f44952',
85+
hmacSha512:
86+
'80b24263c7c1a3ebb71493c1dd7be8b49b46d1f41b4aeec1121b013783f8f3526b56d037e05f2598bd0fd2215d6a1e5295e64f73f63f0aec8b915a985d786598',
87+
);
88+
testCase(
89+
name: 'Test Case 7',
90+
key:
91+
'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
92+
data:
93+
'5468697320697320612074657374207573696e672061206c6172676572207468616e20626c6f636b2d73697a65206b657920616e642061206c6172676572207468616e20626c6f636b2d73697a6520646174612e20546865206b6579206e6565647320746f20626520686173686564206265666f7265206265696e6720757365642062792074686520484d414320616c676f726974686d2e',
94+
hmacSha224: '3a854166ac5d9f023f54d517d0b39dbd946770db9c2b95c9f6f565d1',
95+
hmacSha256:
96+
'9b09ffa71b942fcb27635fbcd5b0e944bfdc63644f0713938a7f51535c3a35e2',
97+
hmacSha384:
98+
'6617178e941f020d351e2f254e8fd32c602420feb0b8fb9adccebb82461e99c5a678cc31e799176d3860e6110c46523e',
99+
hmacSha512:
100+
'e37b6a775dc87dbaa4dfa9f96e5e3ffddebd71f8867289865df5a32d20cdc944b6022cac3c4982b10d5eeb55c3e4de15134676fb6de0446065c97440fa8c6a58',
101+
);
102+
});
103+
}
104+
105+
testCase({
106+
String name,
107+
String key,
108+
String data,
109+
String hmacSha224,
110+
String hmacSha256,
111+
String hmacSha384,
112+
String hmacSha512,
113+
bool truncation = false,
114+
}) {
115+
test(name, () {
116+
final _key = bytesFromHexString(key);
117+
final _data = bytesFromHexString(data);
118+
119+
expect(Hmac(sha224, _key).convert(_data).toString(),
120+
truncation ? startsWith(hmacSha224) : hmacSha224);
121+
expect(Hmac(sha256, _key).convert(_data).toString(),
122+
truncation ? startsWith(hmacSha256) : hmacSha256);
123+
expect(Hmac(sha384, _key).convert(_data).toString(),
124+
truncation ? startsWith(hmacSha384) : hmacSha384);
125+
expect(Hmac(sha512, _key).convert(_data).toString(),
126+
truncation ? startsWith(hmacSha512) : hmacSha512);
127+
});
128+
}

‎pkgs/crypto/test/sha_monte_test.dart

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ import 'dart:typed_data';
33
import 'package:test/test.dart';
44
import 'package:crypto/crypto.dart';
55

6+
import 'utils.dart';
7+
68
main() {
79
group("Monte Vectors", () {
810
monteTest(
@@ -79,12 +81,3 @@ monteTest(String name, Hash hash, String seed, List<String> expected) {
7981
expect(run().toList(), expected);
8082
});
8183
}
82-
83-
final toupleMatch = RegExp('([0-9a-fA-F]{2})');
84-
Uint8List bytesFromHexString(String message) {
85-
var seed = <int>[];
86-
for (var match in toupleMatch.allMatches(message)) {
87-
seed.add(int.parse(match.group(0), radix: 16));
88-
}
89-
return Uint8List.fromList(seed);
90-
}

‎pkgs/crypto/test/utils.dart

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5+
import 'dart:typed_data';
6+
57
import 'package:crypto/crypto.dart';
68
import 'package:test/test.dart';
79

@@ -10,3 +12,13 @@ void expectHmacEquals(Hash hash, List<int> input, List<int> key, String mac) {
1012
var hmac = Hmac(hash, key);
1113
expect(hmac.convert(input).toString(), startsWith(mac));
1214
}
15+
16+
final toupleMatch = RegExp('([0-9a-fA-F]{2})');
17+
18+
Uint8List bytesFromHexString(String message) {
19+
var bytes = <int>[];
20+
for (var match in toupleMatch.allMatches(message)) {
21+
bytes.add(int.parse(match.group(0), radix: 16));
22+
}
23+
return Uint8List.fromList(bytes);
24+
}

0 commit comments

Comments
 (0)