mirror of
https://github.com/ruby/ruby.git
synced 2025-08-15 13:39:04 +02:00
c2fdfb05a4
patched by Kazuki Yamaguchi <k@rhe.jp>
bio: prevent possible GC issue in ossl_obj2bio()
Prevent the new object created by StringValue() from being GCed.
Luckily, as none of the callers of ossl_obj2bio() reads from the
returned BIO after possible triggering GC, this has not been a real
problem.
As a bonus, ossl_protect_obj2bio() function which is no longer used
anywhere is removed.
merge f842b0d5c5
patched by Kazuki Yamaguchi <k@rhe.jp>
bio: do not use the FILE BIO method in ossl_obj2bio()
Read everything from an IO object into a String first and use the
memory buffer BIO method just as we do for String inputs.
For MSVC builds, the FILE BIO method uses the "UPLINK" interface that
requires the application to provide OPENSSL_Applink() function. For us,
the "application" means ruby.exe, in which we can't do anything. As a
workaround, avoid using the FILE BIO method at all.
Usually private keys or X.509 certificates aren't that large and the
temporarily increased memory usage hopefully won't be an issue.
ext/openssl/ossl_version.h (OpenSSL::VERSION): bump to 1.1.1.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@62885 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
61 lines
1.1 KiB
C
61 lines
1.1 KiB
C
/*
|
|
* 'OpenSSL for Ruby' team members
|
|
* Copyright (C) 2003
|
|
* All rights reserved.
|
|
*/
|
|
/*
|
|
* This program is licensed under the same licence as Ruby.
|
|
* (See the file 'LICENCE'.)
|
|
*/
|
|
#include "ossl.h"
|
|
#ifdef HAVE_UNISTD_H
|
|
#include <unistd.h>
|
|
#endif
|
|
|
|
BIO *
|
|
ossl_obj2bio(volatile VALUE *pobj)
|
|
{
|
|
VALUE obj = *pobj;
|
|
BIO *bio;
|
|
|
|
if (RB_TYPE_P(obj, T_FILE))
|
|
obj = rb_funcallv(obj, rb_intern("read"), 0, NULL);
|
|
StringValue(obj);
|
|
bio = BIO_new_mem_buf(RSTRING_PTR(obj), RSTRING_LENINT(obj));
|
|
if (!bio)
|
|
ossl_raise(eOSSLError, "BIO_new_mem_buf");
|
|
*pobj = obj;
|
|
|
|
return bio;
|
|
}
|
|
|
|
VALUE
|
|
ossl_membio2str0(BIO *bio)
|
|
{
|
|
VALUE ret;
|
|
BUF_MEM *buf;
|
|
|
|
BIO_get_mem_ptr(bio, &buf);
|
|
ret = rb_str_new(buf->data, buf->length);
|
|
|
|
return ret;
|
|
}
|
|
|
|
VALUE
|
|
ossl_protect_membio2str(BIO *bio, int *status)
|
|
{
|
|
return rb_protect((VALUE(*)_((VALUE)))ossl_membio2str0, (VALUE)bio, status);
|
|
}
|
|
|
|
VALUE
|
|
ossl_membio2str(BIO *bio)
|
|
{
|
|
VALUE ret;
|
|
int status = 0;
|
|
|
|
ret = ossl_protect_membio2str(bio, &status);
|
|
BIO_free(bio);
|
|
if(status) rb_jump_tag(status);
|
|
|
|
return ret;
|
|
}
|