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

merge revision(s) 55523: [Backport #12524]

* 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.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@55918 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2016-08-16 03:13:24 +00:00
parent bb6e171adb
commit 2f0555c3a1
8 changed files with 28 additions and 16 deletions

View file

@ -1,3 +1,15 @@
Tue Aug 16 12:01:35 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.
Tue Aug 16 11:51:52 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* compile.c (ADD_TRACE): ignore trace instruction on non-positive

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.2"
#define RUBY_RELEASE_DATE "2016-08-16"
#define RUBY_PATCHLEVEL 165
#define RUBY_PATCHLEVEL 166
#define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 8