extended wrong encoding override to deal with github #1639

dghgit · dghgit · commit e50a7cc21716 · 2024-12-27T09:02:13.000+11:00
diff --git a/core/src/main/java/org/bouncycastle/asn1/ASN1RelativeOID.java b/core/src/main/java/org/bouncycastle/asn1/ASN1RelativeOID.java
@@ -246,6 +246,11 @@ static ASN1RelativeOID createPrimitive(byte[] contents, boolean clone)
 
     static boolean isValidContents(byte[] contents)
     {
+        if (Properties.isOverrideSet("org.bouncycastle.asn1.allow_wrong_oid_enc"))
+        {
+            return true;
+        }
+
         if (contents.length < 1)
         {
             return false;
@@ -256,10 +261,7 @@ static boolean isValidContents(byte[] contents)
         {
             if (subIDStart && (contents[i] & 0xff) == 0x80)
             {
-                if (!Properties.isOverrideSet("org.bouncycastle.asn1.allow_wrong_oid_enc"))
-                {
-                    return false;
-                }
+                return false;
             }
 
             subIDStart = (contents[i] & 0x80) == 0;

Original file line number	Diff line number	Diff line change
`@@ -246,6 +246,11 @@ static ASN1RelativeOID createPrimitive(byte[] contents, boolean clone)`
`246`	`246`
`247`	`247`	`static boolean isValidContents(byte[] contents)`
`248`	`248`	`{`
	`249`	`+ if (Properties.isOverrideSet("org.bouncycastle.asn1.allow_wrong_oid_enc"))`
	`250`	`+ {`
	`251`	`+ return true;`
	`252`	`+ }`
	`253`	`+`
`249`	`254`	`if (contents.length < 1)`
`250`	`255`	`{`
`251`	`256`	`return false;`
`@@ -256,10 +261,7 @@ static boolean isValidContents(byte[] contents)`
`256`	`261`	`{`
`257`	`262`	`if (subIDStart && (contents[i] & 0xff) == 0x80)`
`258`	`263`	`{`
`259`		`- if (!Properties.isOverrideSet("org.bouncycastle.asn1.allow_wrong_oid_enc"))`
`260`		`- {`
`261`		`- return false;`
`262`		`- }`
	`264`	`+ return false;`
`263`	`265`	`}`
`264`	`266`
`265`	`267`	`subIDStart = (contents[i] & 0x80) == 0;`