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

* ext/digest/extconf.rb: use OpenSSL only when all transform

Browse source 
functions are available.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26745 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-02-24 00:31:37 +00:00
parent fdb57d043d
commit 5fe5eb264d
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed Feb 24 09:31:33 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/digest/extconf.rb: use OpenSSL only when all transform
functions are available.
Wed Feb 24 00:39:17 2010 Yusuke Endoh <mame@tsg.ne.jp> Wed Feb 24 00:39:17 2010 Yusuke Endoh <mame@tsg.ne.jp>
* string.c (str_new_empty): String#split, partition, rpartition * string.c (str_new_empty): String#split, partition, rpartition

3
ext/digest/sha2/extconf.rb
View file

@ -11,9 +11,10 @@ $objs = [ "sha2init.#{$OBJEXT}" ]
dir_config("openssl") dir_config("openssl")
if !with_config("bundled-sha2") && if !with_config("bundled-sha2") &&
have_library("crypto") && have_header("openssl/sha.h") && have_library("crypto") &&
%w[SHA256 SHA512].all? {|d| have_func("#{d}_Transform", "openssl/sha.h")} %w[SHA256 SHA512].all? {|d| have_func("#{d}_Transform", "openssl/sha.h")}
$objs << "sha2ossl.#{$OBJEXT}" $objs << "sha2ossl.#{$OBJEXT}"
$defs << "-DSHA2_USE_OPENSSL"
else else
have_type("u_int8_t") have_type("u_int8_t")
$objs << "sha2.#{$OBJEXT}" $objs << "sha2.#{$OBJEXT}"

2
ext/digest/sha2/sha2init.c
View file

@ -2,7 +2,7 @@
/* $Id$ */ /* $Id$ */
#include "digest.h" #include "digest.h"
#if defined(HAVE_OPENSSL_SHA_H) && defined(HAVE_SHA256_TRANSFORM) && defined(HAVE_SHA512_TRANSFORM) #if defined(SHA2_USE_OPENSSL)
#include "sha2ossl.h" #include "sha2ossl.h"
#else #else
#include "sha2.h" #include "sha2.h"