aboutsummaryrefslogtreecommitdiff
path: root/rpkid/rpki
diff options
context:
space:
mode:
Diffstat (limited to 'rpkid/rpki')
-rw-r--r--rpkid/rpki/https.py1
-rw-r--r--rpkid/rpki/rpki_engine.py6
2 files changed, 1 insertions, 6 deletions
diff --git a/rpkid/rpki/https.py b/rpkid/rpki/https.py
index 1b2d948e..305182e1 100644
--- a/rpkid/rpki/https.py
+++ b/rpkid/rpki/https.py
@@ -136,7 +136,6 @@ class http_message(object):
class http_request(http_message):
def __init__(self, cmd = None, path = None, version = default_http_version, body = None, callback = None, errback = None, **headers):
- #assert cmd is None or cmd == "POST" or body is None
assert cmd == "POST" or body is None
http_message.__init__(self, version = version, body = body, headers = headers)
self.cmd = cmd
diff --git a/rpkid/rpki/rpki_engine.py b/rpkid/rpki/rpki_engine.py
index c383f9a2..b32d5465 100644
--- a/rpkid/rpki/rpki_engine.py
+++ b/rpkid/rpki/rpki_engine.py
@@ -945,7 +945,7 @@ class child_cert_obj(rpki.sql.sql_persistent):
rpki.log.info("Suppressing withdrawal of %r" % self.cert)
done()
- def reissue(self, ca_detail, callback = None, errback = None, resources = None, sia = None):
+ def reissue(self, ca_detail, callback, errback, resources = None, sia = None):
"""
Reissue an existing cert, reusing the public key. If the cert we
would generate is identical to the one we already have, we just
@@ -955,10 +955,6 @@ class child_cert_obj(rpki.sql.sql_persistent):
child_cert_obj must use the return value from this method.
"""
- # Hack during conversion, remove default values and these assertions eventually
- assert callback is not None
- assert errback is not None
-
ca = ca_detail.ca()
child = self.child()