Skip to content

Commit db99395

Browse files
stbuehlerkoichik
stbuehler
authored and
koichik
committed
Fix crypto hmac to accept binary keys + add test cases from rfc 2202 and 4231
Fixes nodejs#324. Fixes nodejs#1027. Instead of converting buffers to strings and back again to char array directly use the buffer data in hmac_init (same as in hmac_update).
1 parent aa0308d commit db99395

2 files changed

Lines changed: 196 additions & 6 deletions

File tree

‎src/node_crypto.cc‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2386,15 +2386,25 @@ class Hmac : public ObjectWrap {
23862386
return ThrowException(exception);
23872387
}
23882388

2389-
char* buf = new char[len];
2390-
ssize_t written = DecodeWrite(buf, len, args[1], BINARY);
2391-
assert(written == len);
2392-
23932389
String::Utf8Value hashType(args[0]->ToString());
23942390

2395-
bool r = hmac->HmacInit(*hashType, buf, len);
2391+
bool r;
23962392

2397-
delete [] buf;
2393+
if( Buffer::HasInstance(args[1])) {
2394+
Local<Object> buffer_obj = args[1]->ToObject();
2395+
char* buffer_data = Buffer::Data(buffer_obj);
2396+
size_t buffer_length = Buffer::Length(buffer_obj);
2397+
2398+
r = hmac->HmacInit(*hashType, buffer_data, buffer_length);
2399+
} else {
2400+
char* buf = new char[len];
2401+
ssize_t written = DecodeWrite(buf, len, args[1], BINARY);
2402+
assert(written == len);
2403+
2404+
r = hmac->HmacInit(*hashType, buf, len);
2405+
2406+
delete [] buf;
2407+
}
23982408

23992409
if (!r) {
24002410
return ThrowException(Exception::Error(String::New("hmac error")));

‎test/simple/test-crypto.js‎

Lines changed: 180 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,186 @@ var h1 = crypto.createHmac('sha1', 'Node')
5757
.digest('hex');
5858
assert.equal(h1, '19fd6e1ba73d9ed2224dd5094a71babe85d9a892', 'test HMAC');
5959

60+
// Test HMAC-SHA-* (rfc 4231 Test Cases)
61+
var rfc4231 = [
62+
{
63+
key: new Buffer('0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b', 'hex'),
64+
data: new Buffer('4869205468657265', 'hex'), // 'Hi There'
65+
hmac: {
66+
sha224: '896fb1128abbdf196832107cd49df33f47b4b1169912ba4f53684b22',
67+
sha256: 'b0344c61d8db38535ca8afceaf0bf12b881dc200c9833da726e9376c2e32cff7',
68+
sha384: 'afd03944d84895626b0825f4ab46907f15f9dadbe4101ec682aa034c7cebc59cfaea9ea9076ede7f4af152e8b2fa9cb6',
69+
sha512: '87aa7cdea5ef619d4ff0b4241a1d6cb02379f4e2ce4ec2787ad0b30545e17cdedaa833b7d6b8a702038b274eaea3f4e4be9d914eeb61f1702e696c203a126854',
70+
},
71+
},
72+
{
73+
key: new Buffer('4a656665', 'hex'), // 'Jefe'
74+
data: new Buffer('7768617420646f2079612077616e7420666f72206e6f7468696e673f', 'hex'), // 'what do ya want for nothing?'
75+
hmac: {
76+
sha224: 'a30e01098bc6dbbf45690f3a7e9e6d0f8bbea2a39e6148008fd05e44',
77+
sha256: '5bdcc146bf60754e6a042426089575c75a003f089d2739839dec58b964ec3843',
78+
sha384: 'af45d2e376484031617f78d2b58a6b1b9c7ef464f5a01b47e42ec3736322445e8e2240ca5e69e2c78b3239ecfab21649',
79+
sha512: '164b7a7bfcf819e2e395fbe73b56e0a387bd64222e831fd610270cd7ea2505549758bf75c05a994a6d034f65f8f0e6fdcaeab1a34d4a6b4b636e070a38bce737',
80+
},
81+
},
82+
{
83+
key: new Buffer('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', 'hex'),
84+
data: new Buffer('dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd', 'hex'),
85+
hmac: {
86+
sha224: '7fb3cb3588c6c1f6ffa9694d7d6ad2649365b0c1f65d69d1ec8333ea',
87+
sha256: '773ea91e36800e46854db8ebd09181a72959098b3ef8c122d9635514ced565fe',
88+
sha384: '88062608d3e6ad8a0aa2ace014c8a86f0aa635d947ac9febe83ef4e55966144b2a5ab39dc13814b94e3ab6e101a34f27',
89+
sha512: 'fa73b0089d56a284efb0f0756c890be9b1b5dbdd8ee81a3655f83e33b2279d39bf3e848279a722c806b485a47e67c807b946a337bee8942674278859e13292fb',
90+
},
91+
},
92+
{
93+
key: new Buffer('0102030405060708090a0b0c0d0e0f10111213141516171819', 'hex'),
94+
data: new Buffer('cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd', 'hex'),
95+
hmac: {
96+
sha224: '6c11506874013cac6a2abc1bb382627cec6a90d86efc012de7afec5a',
97+
sha256: '82558a389a443c0ea4cc819899f2083a85f0faa3e578f8077a2e3ff46729665b',
98+
sha384: '3e8a69b7783c25851933ab6290af6ca77a9981480850009cc5577c6e1f573b4e6801dd23c4a7d679ccf8a386c674cffb',
99+
sha512: 'b0ba465637458c6990e5a8c5f61d4af7e576d97ff94b872de76f8050361ee3dba91ca5c11aa25eb4d679275cc5788063a5f19741120c4f2de2adebeb10a298dd',
100+
},
101+
},
102+
{
103+
key: new Buffer('0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c', 'hex'),
104+
data: new Buffer('546573742057697468205472756e636174696f6e', 'hex'), // 'Test With Truncation'
105+
hmac: {
106+
sha224: '0e2aea68a90c8d37c988bcdb9fca6fa8',
107+
sha256: 'a3b6167473100ee06e0c796c2955552b',
108+
sha384: '3abf34c3503b2a23a46efc619baef897',
109+
sha512: '415fad6271580a531d4179bc891d87a6',
110+
},
111+
truncate: true,
112+
},
113+
{
114+
key: new Buffer('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', 'hex'),
115+
data: new Buffer('54657374205573696e67204c6172676572205468616e20426c6f636b2d53697a65204b6579202d2048617368204b6579204669727374', 'hex'), // 'Test Using Larger Than Block-Size Key - Hash Key First'
116+
hmac: {
117+
sha224: '95e9a0db962095adaebe9b2d6f0dbce2d499f112f2d2b7273fa6870e',
118+
sha256: '60e431591ee0b67f0d8a26aacbf5b77f8e0bc6213728c5140546040f0ee37f54',
119+
sha384: '4ece084485813e9088d2c63a041bc5b44f9ef1012a2b588f3cd11f05033ac4c60c2ef6ab4030fe8296248df163f44952',
120+
sha512: '80b24263c7c1a3ebb71493c1dd7be8b49b46d1f41b4aeec1121b013783f8f3526b56d037e05f2598bd0fd2215d6a1e5295e64f73f63f0aec8b915a985d786598',
121+
},
122+
},
123+
{
124+
key: new Buffer('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', 'hex'),
125+
data: new Buffer('5468697320697320612074657374207573696e672061206c6172676572207468616e20626c6f636b2d73697a65206b657920616e642061206c6172676572207468616e20626c6f636b2d73697a6520646174612e20546865206b6579206e6565647320746f20626520686173686564206265666f7265206265696e6720757365642062792074686520484d414320616c676f726974686d2e', 'hex'), // 'This is a test using a larger than block-size key and a larger than block-size data. The key needs to be hashed before being used by the HMAC algorithm.'
126+
hmac: {
127+
sha224: '3a854166ac5d9f023f54d517d0b39dbd946770db9c2b95c9f6f565d1',
128+
sha256: '9b09ffa71b942fcb27635fbcd5b0e944bfdc63644f0713938a7f51535c3a35e2',
129+
sha384: '6617178e941f020d351e2f254e8fd32c602420feb0b8fb9adccebb82461e99c5a678cc31e799176d3860e6110c46523e',
130+
sha512: 'e37b6a775dc87dbaa4dfa9f96e5e3ffddebd71f8867289865df5a32d20cdc944b6022cac3c4982b10d5eeb55c3e4de15134676fb6de0446065c97440fa8c6a58',
131+
},
132+
},
133+
];
134+
135+
for (var i = 0, l = rfc4231.length; i < l; i++) {
136+
for (var hash in rfc4231[i]['hmac']) {
137+
var result = crypto.createHmac(hash, rfc4231[i]['key'])
138+
.update(rfc4231[i]['data'])
139+
.digest('hex');
140+
if (rfc4231[i]['truncate']) {
141+
result = result.substr(0, 32); // first 128 bits == 32 hex chars
142+
}
143+
assert.equal(rfc4231[i]['hmac'][hash],
144+
result,
145+
"Test HMAC-" + hash + ": Test case " + (i+1) + " rfc 4231");
146+
}
147+
}
148+
149+
// Test HMAC-MD5/SHA1 (rfc 2202 Test Cases)
150+
var rfc2202_md5 = [
151+
{
152+
key: new Buffer('0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b', 'hex'),
153+
data: 'Hi There',
154+
hmac: '9294727a3638bb1c13f48ef8158bfc9d',
155+
},
156+
{
157+
key: 'Jefe',
158+
data: 'what do ya want for nothing?',
159+
hmac: '750c783e6ab0b503eaa86e310a5db738',
160+
},
161+
{
162+
key: new Buffer('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', 'hex'),
163+
data: new Buffer('dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd', 'hex'),
164+
hmac: '56be34521d144c88dbb8c733f0e8b3f6',
165+
},
166+
{
167+
key: new Buffer('0102030405060708090a0b0c0d0e0f10111213141516171819', 'hex'),
168+
data: new Buffer('cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd', 'hex'),
169+
hmac: '697eaf0aca3a3aea3a75164746ffaa79',
170+
},
171+
{
172+
key: new Buffer('0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c', 'hex'),
173+
data: 'Test With Truncation',
174+
hmac: '56461ef2342edc00f9bab995690efd4c',
175+
},
176+
{
177+
key: new Buffer('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', 'hex'),
178+
data: 'Test Using Larger Than Block-Size Key - Hash Key First',
179+
hmac: '6b1ab7fe4bd7bf8f0b62e6ce61b9d0cd',
180+
},
181+
{
182+
key: new Buffer('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', 'hex'),
183+
data: 'Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data',
184+
hmac: '6f630fad67cda0ee1fb1f562db3aa53e',
185+
},
186+
];
187+
var rfc2202_sha1 = [
188+
{
189+
key: new Buffer('0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b', 'hex'),
190+
data: 'Hi There',
191+
hmac: 'b617318655057264e28bc0b6fb378c8ef146be00',
192+
},
193+
{
194+
key: 'Jefe',
195+
data: 'what do ya want for nothing?',
196+
hmac: 'effcdf6ae5eb2fa2d27416d5f184df9c259a7c79',
197+
},
198+
{
199+
key: new Buffer('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', 'hex'),
200+
data: new Buffer('dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd', 'hex'),
201+
hmac: '125d7342b9ac11cd91a39af48aa17b4f63f175d3',
202+
},
203+
{
204+
key: new Buffer('0102030405060708090a0b0c0d0e0f10111213141516171819', 'hex'),
205+
data: new Buffer('cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd', 'hex'),
206+
hmac: '4c9007f4026250c6bc8414f9bf50c86c2d7235da',
207+
},
208+
{
209+
key: new Buffer('0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c', 'hex'),
210+
data: 'Test With Truncation',
211+
hmac: '4c1a03424b55e07fe7f27be1d58bb9324a9a5a04',
212+
},
213+
{
214+
key: new Buffer('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', 'hex'),
215+
data: 'Test Using Larger Than Block-Size Key - Hash Key First',
216+
hmac: 'aa4ae5e15272d00e95705637ce8a3b55ed402112',
217+
},
218+
{
219+
key: new Buffer('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', 'hex'),
220+
data: 'Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data',
221+
hmac: 'e8e99d0f45237d786d6bbaa7965c7808bbff1a91',
222+
},
223+
];
224+
225+
for (var i = 0, l = rfc2202_md5.length; i < l; i++) {
226+
assert.equal(rfc2202_md5[i]['hmac'],
227+
crypto.createHmac('md5', rfc2202_md5[i]['key'])
228+
.update(rfc2202_md5[i]['data'])
229+
.digest('hex'),
230+
"Test HMAC-MD5 : Test case " + (i+1) + " rfc 2202");
231+
}
232+
for (var i = 0, l = rfc2202_sha1.length; i < l; i++) {
233+
assert.equal(rfc2202_sha1[i]['hmac'],
234+
crypto.createHmac('sha1', rfc2202_sha1[i]['key'])
235+
.update(rfc2202_sha1[i]['data'])
236+
.digest('hex'),
237+
"Test HMAC-SHA1 : Test case " + (i+1) + " rfc 2202");
238+
}
239+
60240
// Test hashing
61241
var a0 = crypto.createHash('sha1').update('Test123').digest('hex');
62242
var a1 = crypto.createHash('md5').update('Test123').digest('binary');

0 commit comments

Comments
 (0)