diff options
| author | nahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-06-22 03:43:38 +0000 |
|---|---|---|
| committer | nahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-06-22 03:43:38 +0000 |
| commit | bda678dc5b8533d7161b1021230b9732acaab0c5 (patch) | |
| tree | 91355bd2c9613e250eb5ff182019690871ba8b9c /ext/openssl/ossl_ssl_session.c | |
| parent | 02ab6d95beca6a23401da882e36123428367960d (diff) | |
* ext/openssl/ossl_ssl_session.c (ossl_ssl_session_to_der):
OpenSSL::SSL::Session#to_der was broken. Fix buffer handling.
* test/openssl/test_ssl_session.rb (test_session): Test it.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32196 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/openssl/ossl_ssl_session.c')
| -rw-r--r-- | ext/openssl/ossl_ssl_session.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/ext/openssl/ossl_ssl_session.c b/ext/openssl/ossl_ssl_session.c index d9db9a67fa..45cc8492c2 100644 --- a/ext/openssl/ossl_ssl_session.c +++ b/ext/openssl/ossl_ssl_session.c @@ -195,20 +195,21 @@ static VALUE ossl_ssl_session_get_id(VALUE self) static VALUE ossl_ssl_session_to_der(VALUE self) { SSL_SESSION *ctx; - unsigned char buf[1024*10], *p; + unsigned char *p; int len; + VALUE str; GetSSLSession(self, ctx); - - p = buf; - len = i2d_SSL_SESSION(ctx, &p); - - if (len <= 0) + len = i2d_SSL_SESSION(ctx, NULL); + if (len <= 0) { ossl_raise(eSSLSession, "i2d_SSL_SESSION"); - else if (len >= (int)sizeof(buf)) - ossl_raise(eSSLSession, "i2d_SSL_SESSION too large"); + } - return rb_str_new((const char *) p, len); + str = rb_str_new(0, len); + p = (unsigned char *)RSTRING_PTR(str); + i2d_SSL_SESSION(ctx, &p); + ossl_str_adjust(str, p); + return str; } /* |