diff options
| -rw-r--r-- | pow/POW-0.7/POW.c | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/pow/POW-0.7/POW.c b/pow/POW-0.7/POW.c index 6811d49a..7ea58ef8 100644 --- a/pow/POW-0.7/POW.c +++ b/pow/POW-0.7/POW.c @@ -7019,15 +7019,9 @@ CMS_object_sign(cms_object *self, PyObject *args) if (!crlobj->crl) lose("CRL object with null crl field!"); - KVETCH("CMS_object_sign(): About to call CMS_add0_crl()"); - - if (!CMS_add0_crl(cms, crlobj->crl)) + if (!CMS_add1_crl(cms, crlobj->crl)) lose_openssl_error("could not add CRL to CMS"); - KVETCH("CMS_object_sign(): Survived call to CMS_add0_crl()"); - - CRYPTO_add(&crlobj->crl->references, 1, CRYPTO_LOCK_X509_CRL); - assert_no_unhandled_openssl_errors(); Py_DECREF(crlobj); @@ -7038,18 +7032,6 @@ CMS_object_sign(cms_object *self, PyObject *args) if ( !CMS_final(cms, bio, NULL, flags)) lose_openssl_error("could not finalize CMS signatures"); - /* - * I'm seeing a succesful return from CMS_final() with an - * EVP_R_COMMAND_NOT_SUPPORTED error left on the error stack. - * Smells like an OpenSSL bug. Appears to do no immediate harm, so - * for now we discard it and move on. - */ - err = ERR_peek_error(); - if (ERR_GET_LIB(err) == ERR_LIB_EVP && ERR_GET_FUNC(err) == EVP_F_EVP_PKEY_CTX_CTRL && ERR_GET_REASON(err) == EVP_R_COMMAND_NOT_SUPPORTED) { - KVETCH("CMS_object_sign(): Ignoring EVP_R_COMMAND_NOT_SUPPORTED"); - ERR_get_error(); /* Discard this error */ - } - assert_no_unhandled_openssl_errors(); if (self->cms) @@ -7137,18 +7119,6 @@ CMS_object_verify(cms_object *self, PyObject *args) if (CMS_verify(self->cms, certs_stack, store->store, NULL, bio, flags) <= 0) lose_openssl_error("could not verify CMS message"); - /* - * I'm seeing a succesful return from CMS_verify() with an - * EVP_R_COMMAND_NOT_SUPPORTED error left on the error stack. - * Smells like an OpenSSL bug. Appears to do no immediate harm, so - * for now we discard it and move on. - */ - err = ERR_peek_error(); - if (ERR_GET_LIB(err) == ERR_LIB_EVP && ERR_GET_FUNC(err) == EVP_F_EVP_PKEY_CTX_CTRL && ERR_GET_REASON(err) == EVP_R_COMMAND_NOT_SUPPORTED) { - KVETCH("CMS_object_verify(): Ignoring EVP_R_COMMAND_NOT_SUPPORTED"); - ERR_get_error(); /* Discard this error */ - } - assert_no_unhandled_openssl_errors(); if (!(len = BIO_ctrl_pending(bio))) |