Originally committed as revision 19450 to svn://svn.ffmpeg.org/ffmpeg/trunk
| ... | ... |
@@ -246,12 +246,12 @@ int av_sha_init(AVSHA* ctx, int bits) |
| 246 | 246 |
ctx->digest_len = bits >> 5; |
| 247 | 247 |
switch (bits) {
|
| 248 | 248 |
case 160: // SHA-1 |
| 249 |
- ctx->state[0] = 0x67452301; |
|
| 250 |
- ctx->state[1] = 0xEFCDAB89; |
|
| 251 |
- ctx->state[2] = 0x98BADCFE; |
|
| 252 |
- ctx->state[3] = 0x10325476; |
|
| 253 |
- ctx->state[4] = 0xC3D2E1F0; |
|
| 254 |
- ctx->transform = sha1_transform; |
|
| 249 |
+ ctx->state[0] = 0x67452301; |
|
| 250 |
+ ctx->state[1] = 0xEFCDAB89; |
|
| 251 |
+ ctx->state[2] = 0x98BADCFE; |
|
| 252 |
+ ctx->state[3] = 0x10325476; |
|
| 253 |
+ ctx->state[4] = 0xC3D2E1F0; |
|
| 254 |
+ ctx->transform = sha1_transform; |
|
| 255 | 255 |
break; |
| 256 | 256 |
case 224: // SHA-224 |
| 257 | 257 |
ctx->state[0] = 0xC1059ED8; |
| ... | ... |
@@ -358,40 +358,40 @@ int main(void) |
| 358 | 358 |
|
| 359 | 359 |
for (j = 0; j < 3; j++) {
|
| 360 | 360 |
printf("Testing SHA-%d\n", lengths[j]);
|
| 361 |
- for (k = 0; k < 3; k++) {
|
|
| 362 |
- av_sha_init(&ctx, lengths[j]); |
|
| 363 |
- if (k == 0) |
|
| 364 |
- av_sha_update(&ctx, "abc", 3); |
|
| 365 |
- else if (k == 1) |
|
| 366 |
- av_sha_update(&ctx, "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", 56); |
|
| 367 |
- else |
|
| 368 |
- for (i = 0; i < 1000*1000; i++) |
|
| 369 |
- av_sha_update(&ctx, "a", 1); |
|
| 370 |
- av_sha_final(&ctx, digest); |
|
| 371 |
- for (i = 0; i < lengths[j] >> 3; i++) |
|
| 372 |
- printf("%02X", digest[i]);
|
|
| 373 |
- putchar('\n');
|
|
| 374 |
- } |
|
| 375 |
- switch (j) {
|
|
| 376 |
- case 0: |
|
| 377 |
- //test vectors (from FIPS PUB 180-1) |
|
| 378 |
- printf("A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D\n"
|
|
| 379 |
- "84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1\n" |
|
| 380 |
- "34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F\n"); |
|
| 381 |
- break; |
|
| 382 |
- case 1: |
|
| 383 |
- //test vectors (from FIPS PUB 180-2 Appendix A) |
|
| 384 |
- printf("23097d22 3405d822 8642a477 bda255b3 2aadbce4 bda0b3f7 e36c9da7\n"
|
|
| 385 |
- "75388b16 512776cc 5dba5da1 fd890150 b0c6455c b4f58b19 52522525\n" |
|
| 386 |
- "20794655 980c91d8 bbb4c1ea 97618a4b f03f4258 1948b2ee 4ee7ad67\n"); |
|
| 387 |
- break; |
|
| 388 |
- case 2: |
|
| 389 |
- //test vectors (from FIPS PUB 180-2) |
|
| 390 |
- printf("ba7816bf 8f01cfea 414140de 5dae2223 b00361a3 96177a9c b410ff61 f20015ad\n"
|
|
| 391 |
- "248d6a61 d20638b8 e5c02693 0c3e6039 a33ce459 64ff2167 f6ecedd4 19db06c1\n" |
|
| 392 |
- "cdc76e5c 9914fb92 81a1c7e2 84d73e67 f1809a48 a497200e 046d39cc c7112cd0\n"); |
|
| 393 |
- break; |
|
| 394 |
- } |
|
| 361 |
+ for (k = 0; k < 3; k++) {
|
|
| 362 |
+ av_sha_init(&ctx, lengths[j]); |
|
| 363 |
+ if (k == 0) |
|
| 364 |
+ av_sha_update(&ctx, "abc", 3); |
|
| 365 |
+ else if (k == 1) |
|
| 366 |
+ av_sha_update(&ctx, "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", 56); |
|
| 367 |
+ else |
|
| 368 |
+ for (i = 0; i < 1000*1000; i++) |
|
| 369 |
+ av_sha_update(&ctx, "a", 1); |
|
| 370 |
+ av_sha_final(&ctx, digest); |
|
| 371 |
+ for (i = 0; i < lengths[j] >> 3; i++) |
|
| 372 |
+ printf("%02X", digest[i]);
|
|
| 373 |
+ putchar('\n');
|
|
| 374 |
+ } |
|
| 375 |
+ switch (j) {
|
|
| 376 |
+ case 0: |
|
| 377 |
+ //test vectors (from FIPS PUB 180-1) |
|
| 378 |
+ printf("A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D\n"
|
|
| 379 |
+ "84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1\n" |
|
| 380 |
+ "34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F\n"); |
|
| 381 |
+ break; |
|
| 382 |
+ case 1: |
|
| 383 |
+ //test vectors (from FIPS PUB 180-2 Appendix A) |
|
| 384 |
+ printf("23097d22 3405d822 8642a477 bda255b3 2aadbce4 bda0b3f7 e36c9da7\n"
|
|
| 385 |
+ "75388b16 512776cc 5dba5da1 fd890150 b0c6455c b4f58b19 52522525\n" |
|
| 386 |
+ "20794655 980c91d8 bbb4c1ea 97618a4b f03f4258 1948b2ee 4ee7ad67\n"); |
|
| 387 |
+ break; |
|
| 388 |
+ case 2: |
|
| 389 |
+ //test vectors (from FIPS PUB 180-2) |
|
| 390 |
+ printf("ba7816bf 8f01cfea 414140de 5dae2223 b00361a3 96177a9c b410ff61 f20015ad\n"
|
|
| 391 |
+ "248d6a61 d20638b8 e5c02693 0c3e6039 a33ce459 64ff2167 f6ecedd4 19db06c1\n" |
|
| 392 |
+ "cdc76e5c 9914fb92 81a1c7e2 84d73e67 f1809a48 a497200e 046d39cc c7112cd0\n"); |
|
| 393 |
+ break; |
|
| 394 |
+ } |
|
| 395 | 395 |
} |
| 396 | 396 |
|
| 397 | 397 |
return 0; |