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

* ext/openssl/ossl_{ec,dh,dsa,rsa}.c: Remove useless warnings.

Browse source 
* ext/openssl/ossl_asn1.c: Simplify code.

* ext/openssl/ossl_ssl_session.c Fix compiler warnings.
  Undefine #id if SSL_SESSION_get_id is not supported.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15610 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
technorama 2008-02-26 07:07:26 +00:00
parent 43b1b0e16a
commit 161b45f59c
7 changed files with 26 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
Tue Feb 26 16:06:00 2008 Technorama Ltd. <oss-ruby@technorama.net>
* ext/openssl/ossl_{ec,dh,dsa,rsa}.c: Remove useless warnings.
* ext/openssl/ossl_asn1.c: Simplify code.
* ext/openssl/ossl_ssl_session.c Fix compiler warnings.
Undefine #id if SSL_SESSION_get_id is not supported.
Tue Feb 26 15:50:10 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (value_expr_gen): removed inappropriate warning.

33
ext/openssl/ossl_asn1.c
View file

@ -347,16 +347,11 @@ decode_bstr(unsigned char* der, int length, long *unused_bits)
if(!(bstr = d2i_ASN1_BIT_STRING(NULL, &p, length)))
ossl_raise(eASN1Error, NULL);
len = bstr->length;
if(!(buf = OPENSSL_malloc(len))){
ASN1_BIT_STRING_free(bstr);
ossl_raise(eASN1Error, NULL);
}
*unused_bits = 0;
if(bstr->flags & ASN1_STRING_FLAG_BITS_LEFT)
*unused_bits = bstr->flags & 0x07;
memcpy(buf, bstr->data, len);
ret = rb_str_new(bstr->data, len);
ASN1_BIT_STRING_free(bstr);
ret = ossl_buf2str(buf, len);
return ret;
}
@ -925,7 +920,7 @@ ossl_asn1prim_to_der(VALUE self)
{
ASN1_TYPE *asn1;
int tn, tc, explicit;
long length, reallen;
long len, reallen;
unsigned char *buf, *p;
VALUE str;
@ -934,26 +929,24 @@ ossl_asn1prim_to_der(VALUE self)
explicit = ossl_asn1_is_explicit(self);
asn1 = ossl_asn1_get_asn1type(self);
length = ASN1_object_size(1, ossl_i2d_ASN1_TYPE(asn1, NULL), tn);
if(!(buf = OPENSSL_malloc(length))){
len = ASN1_object_size(1, ossl_i2d_ASN1_TYPE(asn1, NULL), tn);
if(!(buf = OPENSSL_malloc(len))){
ossl_ASN1_TYPE_free(asn1);
ossl_raise(eASN1Error, "cannot alloc buffer");
}
p = buf;
if(tc == V_ASN1_UNIVERSAL) ossl_i2d_ASN1_TYPE(asn1, &p);
else{
if(explicit){
ASN1_put_object(&p, 1, ossl_i2d_ASN1_TYPE(asn1, NULL), tn, tc);
ossl_i2d_ASN1_TYPE(asn1, &p);
}
else{
ossl_i2d_ASN1_TYPE(asn1, &p);
*buf = tc | tn | (*buf & V_ASN1_CONSTRUCTED);
}
if (tc == V_ASN1_UNIVERSAL) {
ossl_i2d_ASN1_TYPE(asn1, &p);
} else if (explicit) {
ASN1_put_object(&p, 1, ossl_i2d_ASN1_TYPE(asn1, NULL), tn, tc);
ossl_i2d_ASN1_TYPE(asn1, &p);
} else {
ossl_i2d_ASN1_TYPE(asn1, &p);
*buf = tc | tn | (*buf & V_ASN1_CONSTRUCTED);
}
ossl_ASN1_TYPE_free(asn1);
reallen = p - buf;
assert(reallen <= length);
assert(reallen <= len);
str = ossl_buf2str(buf, reallen); /* buf will be free in ossl_buf2str */
return str;

2
ext/openssl/ossl_pkey_dh.c
View file

@ -524,11 +524,9 @@ Init_ossl_dh()
}
#else /* defined NO_DH */
# warning >>> OpenSSL is compiled without DH support <<<
void
Init_ossl_dh()
{
rb_warning("OpenSSL is compiled without DH support");
}
#endif /* NO_DH */

4
ext/openssl/ossl_pkey_dsa.c
View file

@ -477,12 +477,8 @@ Init_ossl_dsa()
}
#else /* defined NO_DSA */
# warning >>> OpenSSL is compiled without DSA support <<<
void
Init_ossl_dsa()
{
rb_warning("OpenSSL is compiled without DSA support");
}
#endif /* NO_DSA */

3
ext/openssl/ossl_pkey_ec.c
View file

@ -1576,10 +1576,7 @@ void Init_ossl_ec()
}
#else /* defined NO_EC */
# warning >>> OpenSSL is compiled without EC support <<<
void Init_ossl_ec()
{
}
#endif /* NO_EC */

2
ext/openssl/ossl_pkey_rsa.c
View file

@ -585,11 +585,9 @@ Init_ossl_rsa()
}
#else /* defined NO_RSA */
# warning >>> OpenSSL is compiled without RSA support <<<
void
Init_ossl_rsa()
{
rb_warning("OpenSSL is compiled without RSA support");
}
#endif /* NO_RSA */

6
ext/openssl/ossl_ssl_session.c
View file

@ -174,7 +174,7 @@ static VALUE ossl_ssl_session_get_id(VALUE self)
p = SSL_SESSION_get_id(ctx, &i);
return rb_str_new(p, i);
return rb_str_new((const char *) p, i);
}
#endif
@ -200,7 +200,7 @@ static VALUE ossl_ssl_session_to_der(VALUE self)
else if (len >= sizeof(buf))
ossl_raise(eSSLSession, "i2d_SSL_SESSION too large");
return rb_str_new(p, len);
return rb_str_new((const char *) p, len);
}
/*
@ -289,6 +289,8 @@ void Init_ossl_ssl_session(void)
#ifdef HAVE_SSL_SESSION_GET_ID
rb_define_method(cSSLSession, "id", ossl_ssl_session_get_id, 0);
#else
rb_undef_method(cSSLSession, "id");
#endif
rb_define_method(cSSLSession, "to_der", ossl_ssl_session_to_der, 0);
rb_define_method(cSSLSession, "to_pem", ossl_ssl_session_to_pem, 0);