зеркало из https://github.com/github/ruby.git
* ext/digest/md5/md5ossl.h: Remove excess semicolons.
Suppress warning on Solaris with Oracle Solaris Studio 12. [ruby-dev:49692] [Bug #12524] * ext/digest/md5/md5cc.h: ditto. * ext/digest/sha1/sha1cc.h: ditto. * ext/digest/sha1/sha1ossl.h: ditto. * ext/digest/sha2/sha2cc.h: ditto. * ext/digest/sha2/sha2ossl.h: ditto. * ext/openssl/ossl_pkey_rsa.c: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55523 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
ad72430863
Коммит
8b251c6c2c
13
ChangeLog
13
ChangeLog
|
@ -1,3 +1,16 @@
|
|||
Tue Jun 28 18:38:09 2016 Naohisa Goto <ngotogenome@gmail.com>
|
||||
|
||||
* ext/digest/md5/md5ossl.h: Remove excess semicolons.
|
||||
Suppress warning on Solaris with Oracle Solaris Studio 12.
|
||||
[ruby-dev:49692] [Bug #12524]
|
||||
|
||||
* ext/digest/md5/md5cc.h: ditto.
|
||||
* ext/digest/sha1/sha1cc.h: ditto.
|
||||
* ext/digest/sha1/sha1ossl.h: ditto.
|
||||
* ext/digest/sha2/sha2cc.h: ditto.
|
||||
* ext/digest/sha2/sha2ossl.h: ditto.
|
||||
* ext/openssl/ossl_pkey_rsa.c: ditto.
|
||||
|
||||
Tue Jun 28 15:56:48 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* test/ruby/enc/test_case_comprehensive.rb: noting to test if
|
||||
|
|
|
@ -3,8 +3,8 @@
|
|||
|
||||
#define MD5_BLOCK_LENGTH CC_MD5_BLOCK_BYTES
|
||||
|
||||
static DEFINE_UPDATE_FUNC_FOR_UINT(MD5);
|
||||
static DEFINE_FINISH_FUNC_FROM_FINAL(MD5);
|
||||
static DEFINE_UPDATE_FUNC_FOR_UINT(MD5)
|
||||
static DEFINE_FINISH_FUNC_FROM_FINAL(MD5)
|
||||
|
||||
#undef MD5_Update
|
||||
#undef MD5_Finish
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
#define MD5_BLOCK_LENGTH MD5_CBLOCK
|
||||
|
||||
static DEFINE_FINISH_FUNC_FROM_FINAL(MD5);
|
||||
static DEFINE_FINISH_FUNC_FROM_FINAL(MD5)
|
||||
#undef MD5_Finish
|
||||
#define MD5_Finish rb_digest_MD5_finish
|
||||
|
||||
|
|
|
@ -5,8 +5,8 @@
|
|||
#define SHA1_DIGEST_LENGTH CC_SHA1_DIGEST_LENGTH
|
||||
#define SHA1_CTX CC_SHA1_CTX
|
||||
|
||||
static DEFINE_UPDATE_FUNC_FOR_UINT(SHA1);
|
||||
static DEFINE_FINISH_FUNC_FROM_FINAL(SHA1);
|
||||
static DEFINE_UPDATE_FUNC_FOR_UINT(SHA1)
|
||||
static DEFINE_FINISH_FUNC_FROM_FINAL(SHA1)
|
||||
|
||||
#undef SHA1_Update
|
||||
#undef SHA1_Finish
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
#endif
|
||||
#define SHA1_DIGEST_LENGTH SHA_DIGEST_LENGTH
|
||||
|
||||
static DEFINE_FINISH_FUNC_FROM_FINAL(SHA1);
|
||||
static DEFINE_FINISH_FUNC_FROM_FINAL(SHA1)
|
||||
#undef SHA1_Finish
|
||||
#define SHA1_Finish rb_digest_SHA1_finish
|
||||
|
||||
|
|
|
@ -7,12 +7,12 @@
|
|||
|
||||
#define SHA384_CTX CC_SHA512_CTX
|
||||
|
||||
static DEFINE_UPDATE_FUNC_FOR_UINT(SHA256);
|
||||
static DEFINE_FINISH_FUNC_FROM_FINAL(SHA256);
|
||||
static DEFINE_UPDATE_FUNC_FOR_UINT(SHA384);
|
||||
static DEFINE_FINISH_FUNC_FROM_FINAL(SHA384);
|
||||
static DEFINE_UPDATE_FUNC_FOR_UINT(SHA512);
|
||||
static DEFINE_FINISH_FUNC_FROM_FINAL(SHA512);
|
||||
static DEFINE_UPDATE_FUNC_FOR_UINT(SHA256)
|
||||
static DEFINE_FINISH_FUNC_FROM_FINAL(SHA256)
|
||||
static DEFINE_UPDATE_FUNC_FOR_UINT(SHA384)
|
||||
static DEFINE_FINISH_FUNC_FROM_FINAL(SHA384)
|
||||
static DEFINE_UPDATE_FUNC_FOR_UINT(SHA512)
|
||||
static DEFINE_FINISH_FUNC_FROM_FINAL(SHA512)
|
||||
|
||||
|
||||
#undef SHA256_Update
|
||||
|
|
|
@ -20,8 +20,8 @@ typedef SHA512_CTX SHA384_CTX;
|
|||
#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);
|
||||
static DEFINE_FINISH_FUNC_FROM_FINAL(SHA256)
|
||||
static DEFINE_FINISH_FUNC_FROM_FINAL(SHA384)
|
||||
static DEFINE_FINISH_FUNC_FROM_FINAL(SHA512)
|
||||
|
||||
#endif
|
||||
|
|
|
@ -656,9 +656,9 @@ ossl_rsa_blinding_off(VALUE self)
|
|||
}
|
||||
*/
|
||||
|
||||
OSSL_PKEY_BN_DEF3(rsa, RSA, key, n, e, d);
|
||||
OSSL_PKEY_BN_DEF2(rsa, RSA, factors, p, q);
|
||||
OSSL_PKEY_BN_DEF3(rsa, RSA, crt_params, dmp1, dmq1, iqmp);
|
||||
OSSL_PKEY_BN_DEF3(rsa, RSA, key, n, e, d)
|
||||
OSSL_PKEY_BN_DEF2(rsa, RSA, factors, p, q)
|
||||
OSSL_PKEY_BN_DEF3(rsa, RSA, crt_params, dmp1, dmq1, iqmp)
|
||||
|
||||
/*
|
||||
* INIT
|
||||
|
|
Загрузка…
Ссылка в новой задаче