diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/digest/md5/md5ossl.c | 13 | ||||
| -rw-r--r-- | ext/digest/md5/md5ossl.h | 18 |
3 files changed, 7 insertions, 30 deletions
@@ -1,8 +1,4 @@ -Tue Jul 15 23:59:39 2014 Jared Jennings <jared.jennings.ctr@us.af.mil> - - * ext/digest/md5/md5ossl.c: use OpenSSL EVP API instead of MD5 API - to perform MD5 hashes using OpenSSL in ext/digest. - [ruby-core:61614] [Bug #9659] +Tue Jul 15 23:59:27 2014 Jared Jennings <jared.jennings.ctr@us.af.mil> * ext/digest: make built-in digest function implementations indicate success or failure of init and final functions. diff --git a/ext/digest/md5/md5ossl.c b/ext/digest/md5/md5ossl.c index d08d2db05e..d94ae2cd2f 100644 --- a/ext/digest/md5/md5ossl.c +++ b/ext/digest/md5/md5ossl.c @@ -2,15 +2,8 @@ #include "md5ossl.h" -int -rb_digest_md5osslevp_Init(EVP_MD_CTX *pctx) +void +MD5_Finish(MD5_CTX *pctx, unsigned char *digest) { - return EVP_DigestInit_ex(pctx, EVP_md5(), NULL); -} - -int -rb_digest_md5osslevp_Finish(EVP_MD_CTX *pctx, unsigned char *digest) -{ - /* if EVP_DigestFinal_ex fails, we ignore that */ - return EVP_DigestFinal_ex(pctx, digest, NULL); + MD5_Final(digest, pctx); } diff --git a/ext/digest/md5/md5ossl.h b/ext/digest/md5/md5ossl.h index f1028704a0..1680c4f5c9 100644 --- a/ext/digest/md5/md5ossl.h +++ b/ext/digest/md5/md5ossl.h @@ -4,22 +4,10 @@ #define MD5OSSL_H_INCLUDED #include <stddef.h> -#include <openssl/evp.h> +#include <openssl/md5.h> -#define MD5_Init rb_digest_md5osslevp_Init -#define MD5_Update EVP_DigestUpdate -#define MD5_Finish rb_digest_md5osslevp_Finish -#define MD5_CTX EVP_MD_CTX +#define MD5_BLOCK_LENGTH MD5_CBLOCK -/* We should use EVP_MD_size(3) and EVP_MD_block_size(3), but the - advantage of these is that they are flexible across digest - algorithms and we are fixing the digest algorithm here; and these - numbers must be constants because the rb_digest_metadata_t - structure is declared const. Simplest way is to write literals. */ -#define MD5_BLOCK_LENGTH 64 -#define MD5_DIGEST_LENGTH 16 - -int MD5_Init(MD5_CTX *pctx); -int MD5_Finish(MD5_CTX *pctx, unsigned char *digest); +void MD5_Finish(MD5_CTX *pctx, unsigned char *digest); #endif |