diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2016-10-11 14:42:16 +0900 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2017-07-23 13:32:35 +0900 |
| commit | 400d9caa243307aca8666592dddcd90206b8eb65 (patch) | |
| tree | a4c6126bebdffa25d27ff126df6c988d93648a8e /ext/openssl | |
| parent | af895bc5596b1521e13a3c6ab65aacdb6913e128 (diff) | |
| download | ruby-openssl-400d9caa243307aca8666592dddcd90206b8eb65.tar.gz | |
asn1: allow constructed encoding with definite length form
Constructed encoding can use the definite length form as well as the
indefinite length form, regardless of the tag number.
Diffstat (limited to 'ext/openssl')
| -rw-r--r-- | ext/openssl/ossl_asn1.c | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/ext/openssl/ossl_asn1.c b/ext/openssl/ossl_asn1.c index 50fcb5b1..b66a8c6e 100644 --- a/ext/openssl/ossl_asn1.c +++ b/ext/openssl/ossl_asn1.c @@ -833,23 +833,10 @@ int_ossl_asn1_decode0_cons(unsigned char **pp, long max_len, long length, if (tc == sym_UNIVERSAL) { VALUE args[4]; - int not_sequence_or_set; - - not_sequence_or_set = tag != V_ASN1_SEQUENCE && tag != V_ASN1_SET; - - if (not_sequence_or_set) { - if (indefinite) { - asn1data = rb_obj_alloc(cASN1Constructive); - } - else { - ossl_raise(eASN1Error, "invalid non-indefinite tag"); - return Qnil; - } - } - else { - VALUE klass = *ossl_asn1_info[tag].klass; - asn1data = rb_obj_alloc(klass); - } + if (tag == V_ASN1_SEQUENCE || tag == V_ASN1_SET) + asn1data = rb_obj_alloc(*ossl_asn1_info[tag].klass); + else + asn1data = rb_obj_alloc(cASN1Constructive); args[0] = ary; args[1] = INT2NUM(tag); args[2] = Qnil; @@ -1224,9 +1211,9 @@ ossl_asn1cons_to_der(VALUE self) } } else { - if (rb_obj_class(self) == cASN1Constructive) - ossl_raise(eASN1Error, "Constructive shall only be used with indefinite length"); tag = ossl_asn1_default_tag(self); + if (tag == -1) /* neither SEQUENCE nor SET */ + tag = ossl_asn1_tag(self); } explicit = ossl_asn1_is_explicit(self); value = join_der(ossl_asn1_get_value(self)); |