正在显示
1 个修改的文件
包含
24 行增加
和
24 行删除
| @@ -466,19 +466,19 @@ enum srs_schema_type { | @@ -466,19 +466,19 @@ enum srs_schema_type { | ||
| 466 | srs_schema_invalid = 2, | 466 | srs_schema_invalid = 2, |
| 467 | }; | 467 | }; |
| 468 | 468 | ||
| 469 | -void __time_copy_to(char*& pp, int32_t time) | 469 | +void __srs_time_copy_to(char*& pp, int32_t time) |
| 470 | { | 470 | { |
| 471 | // 4bytes time | 471 | // 4bytes time |
| 472 | *(int32_t*)pp = time; | 472 | *(int32_t*)pp = time; |
| 473 | pp += 4; | 473 | pp += 4; |
| 474 | } | 474 | } |
| 475 | -void __version_copy_to(char*& pp, int32_t version) | 475 | +void __srs_version_copy_to(char*& pp, int32_t version) |
| 476 | { | 476 | { |
| 477 | // 4bytes version | 477 | // 4bytes version |
| 478 | *(int32_t*)pp = version; | 478 | *(int32_t*)pp = version; |
| 479 | pp += 4; | 479 | pp += 4; |
| 480 | } | 480 | } |
| 481 | -void __key_copy_to(char*& pp, key_block* key) | 481 | +void __srs_key_copy_to(char*& pp, key_block* key) |
| 482 | { | 482 | { |
| 483 | // 764bytes key block | 483 | // 764bytes key block |
| 484 | if (key->random0_size > 0) { | 484 | if (key->random0_size > 0) { |
| @@ -497,7 +497,7 @@ void __key_copy_to(char*& pp, key_block* key) | @@ -497,7 +497,7 @@ void __key_copy_to(char*& pp, key_block* key) | ||
| 497 | *(int32_t*)pp = key->offset; | 497 | *(int32_t*)pp = key->offset; |
| 498 | pp += 4; | 498 | pp += 4; |
| 499 | } | 499 | } |
| 500 | -void __digest_copy_to(char*& pp, digest_block* digest, bool with_digest) | 500 | +void __srs_digest_copy_to(char*& pp, digest_block* digest, bool with_digest) |
| 501 | { | 501 | { |
| 502 | // 732bytes digest block without the 32bytes digest-data | 502 | // 732bytes digest block without the 32bytes digest-data |
| 503 | // nbytes digest block part1 | 503 | // nbytes digest block part1 |
| @@ -525,15 +525,15 @@ void __digest_copy_to(char*& pp, digest_block* digest, bool with_digest) | @@ -525,15 +525,15 @@ void __digest_copy_to(char*& pp, digest_block* digest, bool with_digest) | ||
| 525 | /** | 525 | /** |
| 526 | * copy whole c1s1 to bytes. | 526 | * copy whole c1s1 to bytes. |
| 527 | */ | 527 | */ |
| 528 | -void schema0_copy_to(char* bytes, bool with_digest, | 528 | +void srs_schema0_copy_to(char* bytes, bool with_digest, |
| 529 | int32_t time, int32_t version, key_block* key, digest_block* digest) | 529 | int32_t time, int32_t version, key_block* key, digest_block* digest) |
| 530 | { | 530 | { |
| 531 | char* pp = bytes; | 531 | char* pp = bytes; |
| 532 | 532 | ||
| 533 | - __time_copy_to(pp, time); | ||
| 534 | - __version_copy_to(pp, version); | ||
| 535 | - __key_copy_to(pp, key); | ||
| 536 | - __digest_copy_to(pp, digest, with_digest); | 533 | + __srs_time_copy_to(pp, time); |
| 534 | + __srs_version_copy_to(pp, version); | ||
| 535 | + __srs_key_copy_to(pp, key); | ||
| 536 | + __srs_digest_copy_to(pp, digest, with_digest); | ||
| 537 | 537 | ||
| 538 | if (with_digest) { | 538 | if (with_digest) { |
| 539 | srs_assert(pp - bytes == 1536); | 539 | srs_assert(pp - bytes == 1536); |
| @@ -541,15 +541,15 @@ void schema0_copy_to(char* bytes, bool with_digest, | @@ -541,15 +541,15 @@ void schema0_copy_to(char* bytes, bool with_digest, | ||
| 541 | srs_assert(pp - bytes == 1536 - 32); | 541 | srs_assert(pp - bytes == 1536 - 32); |
| 542 | } | 542 | } |
| 543 | } | 543 | } |
| 544 | -void schema1_copy_to(char* bytes, bool with_digest, | 544 | +void srs_schema1_copy_to(char* bytes, bool with_digest, |
| 545 | int32_t time, int32_t version, digest_block* digest, key_block* key) | 545 | int32_t time, int32_t version, digest_block* digest, key_block* key) |
| 546 | { | 546 | { |
| 547 | char* pp = bytes; | 547 | char* pp = bytes; |
| 548 | 548 | ||
| 549 | - __time_copy_to(pp, time); | ||
| 550 | - __version_copy_to(pp, version); | ||
| 551 | - __digest_copy_to(pp, digest, with_digest); | ||
| 552 | - __key_copy_to(pp, key); | 549 | + __srs_time_copy_to(pp, time); |
| 550 | + __srs_version_copy_to(pp, version); | ||
| 551 | + __srs_digest_copy_to(pp, digest, with_digest); | ||
| 552 | + __srs_key_copy_to(pp, key); | ||
| 553 | 553 | ||
| 554 | if (with_digest) { | 554 | if (with_digest) { |
| 555 | srs_assert(pp - bytes == 1536); | 555 | srs_assert(pp - bytes == 1536); |
| @@ -563,11 +563,11 @@ void schema1_copy_to(char* bytes, bool with_digest, | @@ -563,11 +563,11 @@ void schema1_copy_to(char* bytes, bool with_digest, | ||
| 563 | * digest-data: 32bytes | 563 | * digest-data: 32bytes |
| 564 | * c1s1-part2: (1536-n-32)bytes (digest-part2) | 564 | * c1s1-part2: (1536-n-32)bytes (digest-part2) |
| 565 | */ | 565 | */ |
| 566 | -char* bytes_join_schema0(int32_t time, int32_t version, key_block* key, digest_block* digest) | 566 | +char* srs_bytes_join_schema0(int32_t time, int32_t version, key_block* key, digest_block* digest) |
| 567 | { | 567 | { |
| 568 | char* bytes = new char[1536 -32]; | 568 | char* bytes = new char[1536 -32]; |
| 569 | 569 | ||
| 570 | - schema0_copy_to(bytes, false, time, version, key, digest); | 570 | + srs_schema0_copy_to(bytes, false, time, version, key, digest); |
| 571 | 571 | ||
| 572 | return bytes; | 572 | return bytes; |
| 573 | } | 573 | } |
| @@ -577,11 +577,11 @@ char* bytes_join_schema0(int32_t time, int32_t version, key_block* key, digest_b | @@ -577,11 +577,11 @@ char* bytes_join_schema0(int32_t time, int32_t version, key_block* key, digest_b | ||
| 577 | * digest-data: 32bytes | 577 | * digest-data: 32bytes |
| 578 | * c1s1-part2: (1536-n-32)bytes (digest-part2 and key) | 578 | * c1s1-part2: (1536-n-32)bytes (digest-part2 and key) |
| 579 | */ | 579 | */ |
| 580 | -char* bytes_join_schema1(int32_t time, int32_t version, digest_block* digest, key_block* key) | 580 | +char* srs_bytes_join_schema1(int32_t time, int32_t version, digest_block* digest, key_block* key) |
| 581 | { | 581 | { |
| 582 | char* bytes = new char[1536 -32]; | 582 | char* bytes = new char[1536 -32]; |
| 583 | 583 | ||
| 584 | - schema1_copy_to(bytes, false, time, version, digest, key); | 584 | + srs_schema1_copy_to(bytes, false, time, version, digest, key); |
| 585 | 585 | ||
| 586 | return bytes; | 586 | return bytes; |
| 587 | } | 587 | } |
| @@ -813,9 +813,9 @@ void c1s1::dump(char* _c1s1) | @@ -813,9 +813,9 @@ void c1s1::dump(char* _c1s1) | ||
| 813 | srs_assert(schema != srs_schema_invalid); | 813 | srs_assert(schema != srs_schema_invalid); |
| 814 | 814 | ||
| 815 | if (schema == srs_schema0) { | 815 | if (schema == srs_schema0) { |
| 816 | - schema0_copy_to(_c1s1, true, time, version, &block0.key, &block1.digest); | 816 | + srs_schema0_copy_to(_c1s1, true, time, version, &block0.key, &block1.digest); |
| 817 | } else { | 817 | } else { |
| 818 | - schema1_copy_to(_c1s1, true, time, version, &block0.digest, &block1.key); | 818 | + srs_schema1_copy_to(_c1s1, true, time, version, &block0.digest, &block1.key); |
| 819 | } | 819 | } |
| 820 | } | 820 | } |
| 821 | 821 | ||
| @@ -998,9 +998,9 @@ int c1s1::calc_s1_digest(char*& digest) | @@ -998,9 +998,9 @@ int c1s1::calc_s1_digest(char*& digest) | ||
| 998 | char* c1s1_joined_bytes = NULL; | 998 | char* c1s1_joined_bytes = NULL; |
| 999 | 999 | ||
| 1000 | if (schema == srs_schema0) { | 1000 | if (schema == srs_schema0) { |
| 1001 | - c1s1_joined_bytes = bytes_join_schema0(time, version, &block0.key, &block1.digest); | 1001 | + c1s1_joined_bytes = srs_bytes_join_schema0(time, version, &block0.key, &block1.digest); |
| 1002 | } else { | 1002 | } else { |
| 1003 | - c1s1_joined_bytes = bytes_join_schema1(time, version, &block0.digest, &block1.key); | 1003 | + c1s1_joined_bytes = srs_bytes_join_schema1(time, version, &block0.digest, &block1.key); |
| 1004 | } | 1004 | } |
| 1005 | 1005 | ||
| 1006 | srs_assert(c1s1_joined_bytes != NULL); | 1006 | srs_assert(c1s1_joined_bytes != NULL); |
| @@ -1025,9 +1025,9 @@ int c1s1::calc_c1_digest(char*& digest) | @@ -1025,9 +1025,9 @@ int c1s1::calc_c1_digest(char*& digest) | ||
| 1025 | char* c1s1_joined_bytes = NULL; | 1025 | char* c1s1_joined_bytes = NULL; |
| 1026 | 1026 | ||
| 1027 | if (schema == srs_schema0) { | 1027 | if (schema == srs_schema0) { |
| 1028 | - c1s1_joined_bytes = bytes_join_schema0(time, version, &block0.key, &block1.digest); | 1028 | + c1s1_joined_bytes = srs_bytes_join_schema0(time, version, &block0.key, &block1.digest); |
| 1029 | } else { | 1029 | } else { |
| 1030 | - c1s1_joined_bytes = bytes_join_schema1(time, version, &block0.digest, &block1.key); | 1030 | + c1s1_joined_bytes = srs_bytes_join_schema1(time, version, &block0.digest, &block1.key); |
| 1031 | } | 1031 | } |
| 1032 | 1032 | ||
| 1033 | srs_assert(c1s1_joined_bytes != NULL); | 1033 | srs_assert(c1s1_joined_bytes != NULL); |
-
请 注册 或 登录 后发表评论