diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-11 02:09:23 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-11 02:09:23 +0000 |
| commit | 935275bb5952b59b65c6a038a4b825aea95562ae (patch) | |
| tree | 4f6fe32cbd24811dcc0b38153d426adc845dde02 /ext/digest/sha2 | |
| parent | b632ca436c5d06defc87df8b2a4774680e9cf6ef (diff) | |
digest: define Finish func from Final func
* ext/digest/digest.h (DEFINE_FINISH_FUNC_FROM_FINAL): macro for
finish functions, by inverting arguments order.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49564 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/digest/sha2')
| -rw-r--r-- | ext/digest/sha2/sha2ossl.c | 13 | ||||
| -rw-r--r-- | ext/digest/sha2/sha2ossl.h | 16 |
2 files changed, 13 insertions, 16 deletions
diff --git a/ext/digest/sha2/sha2ossl.c b/ext/digest/sha2/sha2ossl.c deleted file mode 100644 index 34353be8b8..0000000000 --- a/ext/digest/sha2/sha2ossl.c +++ /dev/null @@ -1,13 +0,0 @@ -#include "defs.h" -#include "sha2ossl.h" - -#define SHA_Finish(bit) \ - void SHA##bit##_Finish(SHA##bit##_CTX *ctx, char *buf) \ - { SHA##bit##_Final((unsigned char *)buf, ctx);} -#ifndef __DragonFly__ -#define SHA384_Final SHA512_Final -#endif - -SHA_Finish(256) -SHA_Finish(384) -SHA_Finish(512) diff --git a/ext/digest/sha2/sha2ossl.h b/ext/digest/sha2/sha2ossl.h index 4229d14cf9..f7258ee64a 100644 --- a/ext/digest/sha2/sha2ossl.h +++ b/ext/digest/sha2/sha2ossl.h @@ -8,10 +8,20 @@ #define SHA384_BLOCK_LENGTH SHA512_CBLOCK #define SHA512_BLOCK_LENGTH SHA512_CBLOCK +#ifndef __DragonFly__ +#define SHA384_Final SHA512_Final +#endif + typedef SHA512_CTX SHA384_CTX; -void SHA256_Finish(SHA256_CTX *ctx, char *buf); -void SHA384_Finish(SHA384_CTX *ctx, char *buf); -void SHA512_Finish(SHA512_CTX *ctx, char *buf); +#undef SHA256_Finish +#undef SHA384_Finish +#undef SHA512_Finish +#define SHA256_Finish rb_digest_SHA256_finish +#define SHA384_Finish rb_digest_SHA384_finish +#define SHA512_Finish rb_digest_SHA512_finish +static DEFINE_FINISH_FUNC_FROM_FINAL(SHA256); +static DEFINE_FINISH_FUNC_FROM_FINAL(SHA384); +static DEFINE_FINISH_FUNC_FROM_FINAL(SHA512); #endif |