@@ -44,11 +44,11 @@
 
 /* Test vectors from RFC 6070 */
 
 - (void)testRFC6070TestVector1
 {
-	unsigned char key[25];
+	unsigned char key[20];
 
 	OFPBKDF2((OFPBKDF2Parameters){
 		.HMAC                  = _HMAC,
 		.iterations            = 1,
 		.salt                  = (unsigned char *)"salt",
@@ -64,11 +64,11 @@
 	    "\x24\xAF\x60\x12\x06\x2F\xE0\x37\xA6", 20), 0);
 }
 
 - (void)testRFC6070TestVector2
 {
-	unsigned char key[25];
+	unsigned char key[20];
 
 	OFPBKDF2((OFPBKDF2Parameters){
 		.HMAC                  = _HMAC,
 		.iterations            = 2,
 		.salt                  = (unsigned char *)"salt",
@@ -84,11 +84,11 @@
 	    "\x2A\xCE\x1D\x41\xF0\xD8\xDE\x89\x57", 20), 0);
 }
 
 - (void)testRFC6070TestVector3
 {
-	unsigned char key[25];
+	unsigned char key[20];
 
 	OFPBKDF2((OFPBKDF2Parameters){
 		.HMAC                  = _HMAC,
 		.iterations            = 4096,
 		.salt                  = (unsigned char *)"salt",
@@ -106,11 +106,11 @@
 
 #if 0
 /* This test takes too long, even on a fast machine. */
 - (void)testRFC6070TestVector4
 {
-	unsigned char key[25];
+	unsigned char key[20];
 
 	OFPBKDF2((OFPBKDF2Parameters){
 		.HMAC                  = _HMAC,
 		.iterations            = 16777216,
 		.salt                  = (unsigned char *)"salt",
@@ -148,11 +148,11 @@
 	    "\x36\x62\xC0\xE4\x4A\x8B\x29\x1A\x96\x4C\xF2\xF0\x70\x38", 25), 0);
 }
 
 - (void)testRFC6070TestVector6
 {
-	unsigned char key[25];
+	unsigned char key[16];
 
 	OFPBKDF2((OFPBKDF2Parameters){
 		.HMAC                  = _HMAC,
 		.iterations            = 4096,
 		.salt                  = (unsigned char *)"sa\0lt",