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

ossl_cipher.c: workaround of OpenSSL API

Browse source 
* ext/openssl/ossl_cipher.c (ossl_cipher_update_long): update huge
  data gradually not to exceed INT_MAX.  workaround of OpenSSL API
  limitation.  [ruby-core:67043] [Bug #10633]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48923 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-12-23 02:42:16 +00:00
parent 2f4570e742
commit debedd371a
2 changed files with 43 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Tue Dec 23 11:42:14 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/openssl/ossl_cipher.c (ossl_cipher_update_long): update huge
data gradually not to exceed INT_MAX. workaround of OpenSSL API
limitation. [ruby-core:67043] [Bug #10633]
Mon Dec 22 21:30:16 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> Mon Dec 22 21:30:16 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* test/win32ole/test_win32ole_event.rb: some tests are * test/win32ole/test_win32ole_event.rb: some tests are

44
ext/openssl/ossl_cipher.c
View file

@ -346,6 +346,33 @@ ossl_cipher_pkcs5_keyivgen(int argc, VALUE *argv, VALUE self)
return Qnil; return Qnil;
} }
static int
ossl_cipher_update_long(EVP_CIPHER_CTX *ctx, unsigned char *out, long *out_len_ptr,
const unsigned char *in, long in_len)
{
int out_part_len;
long out_len = 0;
#define UPDATE_LENGTH_LIMIT INT_MAX
#if SIZEOF_LONG > UPDATE_LENGTH_LIMIT
if (in_len > UPDATE_LENGTH_LIMIT) {
const int in_part_len = (UPDATE_LENGTH_LIMIT / 2 + 1) & ~1;
do {
if (!EVP_CipherUpdate(ctx, out ? (out + out_len) : 0,
&out_part_len, in, in_part_len))
return 0;
out_len += out_part_len;
in += in_part_len;
} while ((in_len -= in_part_len) > UPDATE_LENGTH_LIMIT);
}
#endif
if (!EVP_CipherUpdate(ctx, out ? (out + out_len) : 0,
&out_part_len, in, (int)in_len))
return 0;
if (out_len_ptr) *out_len_ptr = out_len += out_part_len;
return 1;
}
/* /*
* call-seq: * call-seq:
* cipher.update(data [, buffer]) -> string or buffer * cipher.update(data [, buffer]) -> string or buffer
@ -364,17 +391,21 @@ ossl_cipher_update(int argc, VALUE *argv, VALUE self)
{ {
EVP_CIPHER_CTX *ctx; EVP_CIPHER_CTX *ctx;
unsigned char *in; unsigned char *in;
int in_len, out_len; long in_len, out_len;
VALUE data, str; VALUE data, str;
rb_scan_args(argc, argv, "11", &data, &str); rb_scan_args(argc, argv, "11", &data, &str);
StringValue(data); StringValue(data);
in = (unsigned char *)RSTRING_PTR(data); in = (unsigned char *)RSTRING_PTR(data);
if ((in_len = RSTRING_LENINT(data)) == 0) if ((in_len = RSTRING_LEN(data)) == 0)
ossl_raise(rb_eArgError, "data must not be empty"); ossl_raise(rb_eArgError, "data must not be empty");
GetCipher(self, ctx); GetCipher(self, ctx);
out_len = in_len+EVP_CIPHER_CTX_block_size(ctx); out_len = in_len+EVP_CIPHER_CTX_block_size(ctx);
if (out_len <= 0) {
ossl_raise(rb_eRangeError,
"data too big to make output buffer: %ld bytes", in_len);
}
if (NIL_P(str)) { if (NIL_P(str)) {
str = rb_str_new(0, out_len); str = rb_str_new(0, out_len);
@ -383,7 +414,7 @@ ossl_cipher_update(int argc, VALUE *argv, VALUE self)
rb_str_resize(str, out_len); rb_str_resize(str, out_len);
} }
if (!EVP_CipherUpdate(ctx, (unsigned char *)RSTRING_PTR(str), &out_len, in, in_len)) if (!ossl_cipher_update_long(ctx, (unsigned char *)RSTRING_PTR(str), &out_len, in, in_len))
ossl_raise(eCipherError, NULL); ossl_raise(eCipherError, NULL);
assert(out_len < RSTRING_LEN(str)); assert(out_len < RSTRING_LEN(str));
rb_str_set_len(str, out_len); rb_str_set_len(str, out_len);
@ -523,17 +554,16 @@ ossl_cipher_set_auth_data(VALUE self, VALUE data)
{ {
EVP_CIPHER_CTX *ctx; EVP_CIPHER_CTX *ctx;
unsigned char *in; unsigned char *in;
int in_len; long in_len, out_len;
int out_len;
StringValue(data); StringValue(data);
in = (unsigned char *) RSTRING_PTR(data); in = (unsigned char *) RSTRING_PTR(data);
in_len = RSTRING_LENINT(data); in_len = RSTRING_LEN(data);
GetCipher(self, ctx); GetCipher(self, ctx);
if (!EVP_CipherUpdate(ctx, NULL, &out_len, in, in_len)) if (!ossl_cipher_update_long(ctx, NULL, &out_len, in, in_len))
ossl_raise(eCipherError, "couldn't set additional authenticated data"); ossl_raise(eCipherError, "couldn't set additional authenticated data");
return data; return data;