From 391fb47fd3701aeadaf99c0b4ea41e2c0ce90182 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Mon, 10 Feb 2014 19:11:19 +0100
Subject: [PATCH] Standards.X509.TBSCertificate: Some bugfixes.
Fixed clearing of extensions state when reducing version from 3.
Now supports reducing version from 3 to 2.
Fixed some state handling when parsing version 2 fields.
---
lib/modules/Standards.pmod/X509.pmod | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/lib/modules/Standards.pmod/X509.pmod b/lib/modules/Standards.pmod/X509.pmod
index 0c0d548066..76382d2417 100644
--- a/lib/modules/Standards.pmod/X509.pmod
+++ b/lib/modules/Standards.pmod/X509.pmod
@@ -395,12 +395,25 @@ class TBSCertificate
internal_der = UNDEFINED;
if (v == 1) {
if (sizeof(elements) > 6) {
+ DBG("Reducing version to %d\n", v);
elements = elements[1..6];
issuer_pos = subject_pos = extensions_pos = 0;
+ internal_extensions = ([]);
+ internal_critical = (<>);
}
} else if (sizeof(elements) == 6) {
+ DBG("Bumping version to %d\n", v);
elements = ({ version_integer(Integer(v-1)) }) + elements;
} else {
+ if ((v < 3) && extensions_pos) {
+ DBG("Reducing version to %d\n", v);
+ elements = elements[..extensions_pos-1];
+ extensions_pos = 0;
+ internal_extensions = ([]);
+ internal_critical = (<>);
+ } else {
+ DBG("Bumping version to %d\n", v);
+ }
elements[0] = version_integer(Integer(v-1));
}
}
@@ -648,7 +661,7 @@ class TBSCertificate
}
}
- if (extensions_pos) {
+ if (!extensions_pos) {
if (version < 3) version = 3;
extensions_pos = sizeof(elements);
elements = elements + ({ TaggedType3(r) });
@@ -865,8 +878,6 @@ class TBSCertificate
subject_id = BitString()->decode_primitive(a[i]->raw);
DBG("TBSCertificate: subject_id = %O\n", subject_id);
i++;
- if (i == sizeof(a))
- return this;
}
}
if (version >= 3) {
@@ -875,6 +886,7 @@ class TBSCertificate
sizeof(a[i])==1 &&
a[i][0]->type_name == "SEQUENCE") {
raw_extensions = a[i][0];
+ i++;
}
}
internal_der = asn1->get_der();
--
GitLab