archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 16:44:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

* ext/openssl/ossl_asn1.c

Browse source 
ext/openssl/ossl_pkey.c: Remove unused variables.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33317 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
emboss 2011-09-23 05:17:47 +00:00
parent 387b4169fb
commit 4d752775e7
3 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Fri Sep 23 14:15:01 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
* ext/openssl/ossl_asn1.c
ext/openssl/ossl_pkey.c: Remove unused variables.
Fri Sep 23 06:54:44 2011 Martin Bosslet <Martin.Bosslet@googlemail.com> Fri Sep 23 06:54:44 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
* backport r33315 from trunk. * backport r33315 from trunk.

7
ext/openssl/ossl_asn1.c
View file

@ -467,7 +467,6 @@ decode_time(unsigned char* der, int length)
static VALUE static VALUE
decode_eoc(unsigned char *der, int length) decode_eoc(unsigned char *der, int length)
{ {
VALUE ret;
if (length != 2 || !(der[0] == 0x00 && der[1] == 0x00)) if (length != 2 || !(der[0] == 0x00 && der[1] == 0x00))
ossl_raise(eASN1Error, NULL); ossl_raise(eASN1Error, NULL);
@ -894,10 +893,6 @@ int_ossl_asn1_decode0_cons(unsigned char **pp, long max_len, long length,
ossl_asn1_initialize(4, args, asn1data); ossl_asn1_initialize(4, args, asn1data);
} }
else { else {
VALUE args[3];
args[0] = ary;
args[1] = INT2NUM(tag);
args[2] = ID2SYM(tc);
asn1data = rb_obj_alloc(cASN1Data); asn1data = rb_obj_alloc(cASN1Data);
ossl_asn1data_initialize(asn1data, ary, INT2NUM(tag), ID2SYM(tc)); ossl_asn1data_initialize(asn1data, ary, INT2NUM(tag), ID2SYM(tc));
} }
@ -1036,7 +1031,7 @@ ossl_asn1_traverse(VALUE self, VALUE obj)
static VALUE static VALUE
ossl_asn1_decode(VALUE self, VALUE obj) ossl_asn1_decode(VALUE self, VALUE obj)
{ {
VALUE ret, ary; VALUE ret;
unsigned char *p; unsigned char *p;
volatile VALUE tmp; volatile VALUE tmp;
long len, read = 0, offset = 0; long len, read = 0, offset = 0;

1
ext/openssl/ossl_pkey.c
View file

@ -101,7 +101,6 @@ ossl_pkey_new_from_file(VALUE filename)
static VALUE static VALUE
ossl_pkey_new_from_data(int argc, VALUE *argv, VALUE self) ossl_pkey_new_from_data(int argc, VALUE *argv, VALUE self)
{ {
FILE *fp;
EVP_PKEY *pkey; EVP_PKEY *pkey;
BIO *bio; BIO *bio;
VALUE data, pass; VALUE data, pass;