summaryrefslogtreecommitdiff
path: root/ext/digest
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-07-15 14:59:32 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-07-15 14:59:32 +0000
commit2d33fc97a3742800e65bf647e5b66d0af58e7123 (patch)
treeb6293b0c7edf8f59340a397b2c9d9bd3562b8247 /ext/digest
parentaadebb29da14b65f47cf3e08ac164e6fe191febe (diff)
md5ossl.c: indicate the result
* 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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46828 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/digest')
-rw-r--r--ext/digest/md5/md5ossl.c13
-rw-r--r--ext/digest/md5/md5ossl.h18
2 files changed, 25 insertions, 6 deletions
diff --git a/ext/digest/md5/md5ossl.c b/ext/digest/md5/md5ossl.c
index d94ae2c..d08d2db 100644
--- a/ext/digest/md5/md5ossl.c
+++ b/ext/digest/md5/md5ossl.c
@@ -2,8 +2,15 @@
#include "md5ossl.h"
-void
-MD5_Finish(MD5_CTX *pctx, unsigned char *digest)
+int
+rb_digest_md5osslevp_Init(EVP_MD_CTX *pctx)
{
- MD5_Final(digest, pctx);
+ 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);
}
diff --git a/ext/digest/md5/md5ossl.h b/ext/digest/md5/md5ossl.h
index 1680c4f..f102870 100644
--- a/ext/digest/md5/md5ossl.h
+++ b/ext/digest/md5/md5ossl.h
@@ -4,10 +4,22 @@
#define MD5OSSL_H_INCLUDED
#include <stddef.h>
-#include <openssl/md5.h>
+#include <openssl/evp.h>
-#define MD5_BLOCK_LENGTH MD5_CBLOCK
+#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
-void MD5_Finish(MD5_CTX *pctx, unsigned char *digest);
+/* 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);
#endif