kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Revert r46828

Browse source 
r46828 "md5ossl.c: indicate the result" caused segfaults.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46829 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-07-15 15:43:03 +00:00
parent 2d33fc97a3
commit 5dbe603f09
3 changed files with 7 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,8 +1,4 @@
Tue Jul 15 23:59:39 2014 Jared Jennings <jared.jennings.ctr@us.af.mil> Tue Jul 15 23:59:27 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]
* ext/digest: make built-in digest function implementations * ext/digest: make built-in digest function implementations
indicate success or failure of init and final functions. indicate success or failure of init and final functions.

13
ext/digest/md5/md5ossl.c
View file

@ -2,15 +2,8 @@
#include "md5ossl.h" #include "md5ossl.h"
int void
rb_digest_md5osslevp_Init(EVP_MD_CTX *pctx) MD5_Finish(MD5_CTX *pctx, unsigned char *digest)
{ {
return EVP_DigestInit_ex(pctx, EVP_md5(), NULL); MD5_Final(digest, pctx);
}
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);
} }

18
ext/digest/md5/md5ossl.h
View file

@ -4,22 +4,10 @@
#define MD5OSSL_H_INCLUDED #define MD5OSSL_H_INCLUDED
#include <stddef.h> #include <stddef.h>
#include <openssl/evp.h> #include <openssl/md5.h>
#define MD5_Init rb_digest_md5osslevp_Init #define MD5_BLOCK_LENGTH MD5_CBLOCK
#define MD5_Update EVP_DigestUpdate
#define MD5_Finish rb_digest_md5osslevp_Finish
#define MD5_CTX EVP_MD_CTX
/* We should use EVP_MD_size(3) and EVP_MD_block_size(3), but the void MD5_Finish(MD5_CTX *pctx, unsigned char *digest);
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 #endif