a test case for indefinite length encoding eliminated as it's

forbidden in DER

12 files changed, 13 insertions, 31 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 061ae55..dffb86c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,8 @@ Revision 0.0.6
 --------------
 
 - Typo fix to id_kp_serverAuth object value
+- A test case for indefinite length encoding eliminated as it's
+  forbidden in DER.
 
 Revision 0.0.5
 --------------
diff --git a/tools/cmpdump.py b/tools/cmpdump.py
index 74c4f77..03a58d9 100644
--- a/tools/cmpdump.py
+++ b/tools/cmpdump.py
@@ -23,6 +23,4 @@ pkiMsg, rest = decoder.decode(substrate, asn1Spec=pkiMessage)
 
 print(pkiMsg.prettyPrint())
 
-assert encoder.encode(pkiMsg, defMode=False) == substrate or \
-       encoder.encode(pkiMsg, defMode=True) == substrate, \
-       'CMP message recode fails'
+assert encoder.encode(pkiMsg) == substrate, 'CMP message recode fails'
diff --git a/tools/crldump.py b/tools/crldump.py
index d4b0a54..3ddcfa9 100644
--- a/tools/crldump.py
+++ b/tools/crldump.py
@@ -29,9 +29,7 @@ while 1:
         
     print(key.prettyPrint())
 
-    assert encoder.encode(key, defMode=False) == substrate or \
-           encoder.encode(key, defMode=True) == substrate, \
-           'pkcs8 recode fails'
+    assert encoder.encode(key) == substrate, 'pkcs8 recode fails'
         
     cnt = cnt + 1
  
diff --git a/tools/crmfdump.py b/tools/crmfdump.py
index 22bfc9d..25e9c6d 100644
--- a/tools/crmfdump.py
+++ b/tools/crmfdump.py
@@ -20,6 +20,4 @@ cr, rest = decoder.decode(substrate, asn1Spec=certReq)
 
 print(cr.prettyPrint())
 
-assert encoder.encode(cr, defMode=False) == substrate or \
-       encoder.encode(cr, defMode=True) == substrate, \
-       'crmf recode fails'
+assert encoder.encode(cr) == substrate, 'crmf recode fails'
diff --git a/tools/ocspclient.py b/tools/ocspclient.py
index b2d1dfc..aadaf85 100644
--- a/tools/ocspclient.py
+++ b/tools/ocspclient.py
@@ -22,7 +22,7 @@ class ValueOnlyBitStringEncoder(encoder.encoder.BitStringEncoder):
         return substrate[1:], isConstructed
 
     def __call__(self, bitStringValue):
-        return self.encode(None, bitStringValue, defMode=1, maxChunkSize=0)
+        return self.encode(None, bitStringValue, maxChunkSize=0)
 
 valueOnlyBitStringEncoder = ValueOnlyBitStringEncoder()
 
diff --git a/tools/ocspreqdump.py b/tools/ocspreqdump.py
index 3a03115..c163c18 100644
--- a/tools/ocspreqdump.py
+++ b/tools/ocspreqdump.py
@@ -22,6 +22,4 @@ cr, rest = decoder.decode(substrate, asn1Spec=ocspReq)
 
 print(cr.prettyPrint())
 
-assert encoder.encode(cr, defMode=False) == substrate or \
-       encoder.encode(cr, defMode=True) == substrate, \
-       'OCSP request recode fails'
+assert encoder.encode(cr) == substrate, 'OCSP request recode fails'
diff --git a/tools/ocsprspdump.py b/tools/ocsprspdump.py
index 9e49ce0..2df19b5 100644
--- a/tools/ocsprspdump.py
+++ b/tools/ocsprspdump.py
@@ -22,6 +22,4 @@ cr, rest = decoder.decode(substrate, asn1Spec=ocspReq)
 
 print(cr.prettyPrint())
 
-assert encoder.encode(cr, defMode=False) == substrate or \
-       encoder.encode(cr, defMode=True) == substrate, \
-       'OCSP request recode fails'
+assert encoder.encode(cr) == substrate, 'OCSP request recode fails'
diff --git a/tools/pkcs10dump.py b/tools/pkcs10dump.py
index ea979c0..de49b4e 100644
--- a/tools/pkcs10dump.py
+++ b/tools/pkcs10dump.py
@@ -30,9 +30,7 @@ while 1:
         
     print(cert.prettyPrint())
 
-    assert encoder.encode(cert, defMode=False) == substrate or \
-           encoder.encode(cert, defMode=True) == substrate, \
-           'cert recode fails'
+    assert encoder.encode(cert) == substrate, 'cert recode fails'
         
     certCnt = certCnt + 1
     
diff --git a/tools/pkcs1dump.py b/tools/pkcs1dump.py
index d0da82b..940bfe7 100644
--- a/tools/pkcs1dump.py
+++ b/tools/pkcs1dump.py
@@ -33,9 +33,7 @@ while 1:
         
     print(key.prettyPrint())
 
-    assert encoder.encode(key, defMode=False) == substrate or \
-           encoder.encode(key, defMode=True) == substrate, \
-           'pkcs8 recode fails'
+    assert encoder.encode(key) == substrate, 'pkcs8 recode fails'
         
     cnt = cnt + 1
  
diff --git a/tools/pkcs7dump.py b/tools/pkcs7dump.py
index 7794871..151ad21 100644
--- a/tools/pkcs7dump.py
+++ b/tools/pkcs7dump.py
@@ -24,9 +24,7 @@ if rest: substrate = substrate[:-len(rest)]
     
 print(contentInfo.prettyPrint())
 
-assert encoder.encode(contentInfo, defMode=False) == substrate or \
-       encoder.encode(contentInfo, defMode=True) == substrate, \
-       're-encode fails'
+assert encoder.encode(contentInfo) == substrate, 're-encode fails'
 
 contentType = contentInfo.getComponentByName('contentType')
 
diff --git a/tools/pkcs8dump.py b/tools/pkcs8dump.py
index d1d125f..987cf0a 100644
--- a/tools/pkcs8dump.py
+++ b/tools/pkcs8dump.py
@@ -32,9 +32,7 @@ while 1:
         
     print(key.prettyPrint())
 
-    assert encoder.encode(key, defMode=False) == substrate or \
-           encoder.encode(key, defMode=True) == substrate, \
-           'pkcs8 recode fails'
+    assert encoder.encode(key) == substrate, 'pkcs8 recode fails'
         
     cnt = cnt + 1
     
diff --git a/tools/x509dump.py b/tools/x509dump.py
index 64cba7e..dbe1628 100644
--- a/tools/x509dump.py
+++ b/tools/x509dump.py
@@ -31,9 +31,7 @@ while 1:
         
     print(cert.prettyPrint())
 
-    assert encoder.encode(cert, defMode=False) == substrate or \
-           encoder.encode(cert, defMode=True) == substrate, \
-           'cert recode fails'
+    assert encoder.encode(cert) == substrate, 'cert recode fails'
         
     certCnt = certCnt + 1