[ruby/openssl] pkcs7: remove unnecessary const cast
PKCS7_encrypt() and PKCS7_SIGNER_INFO_set() take const EVP_CIPHER and EVP_MD at least since OpenSSL 0.9.7. https://github.com/ruby/openssl/commit/9db621a5c0
This commit is contained in:
parent
04cc762941
commit
010e8bff88
@ -325,7 +325,7 @@ ossl_pkcs7_s_encrypt(int argc, VALUE *argv, VALUE klass)
|
|||||||
BIO_free(in);
|
BIO_free(in);
|
||||||
rb_jump_tag(status);
|
rb_jump_tag(status);
|
||||||
}
|
}
|
||||||
if(!(p7 = PKCS7_encrypt(x509s, in, (EVP_CIPHER*)ciph, flg))){
|
if (!(p7 = PKCS7_encrypt(x509s, in, ciph, flg))) {
|
||||||
BIO_free(in);
|
BIO_free(in);
|
||||||
sk_X509_pop_free(x509s, X509_free);
|
sk_X509_pop_free(x509s, X509_free);
|
||||||
ossl_raise(ePKCS7Error, NULL);
|
ossl_raise(ePKCS7Error, NULL);
|
||||||
@ -947,7 +947,7 @@ ossl_pkcs7si_initialize(VALUE self, VALUE cert, VALUE key, VALUE digest)
|
|||||||
x509 = GetX509CertPtr(cert); /* NO NEED TO DUP */
|
x509 = GetX509CertPtr(cert); /* NO NEED TO DUP */
|
||||||
md = ossl_evp_get_digestbyname(digest);
|
md = ossl_evp_get_digestbyname(digest);
|
||||||
GetPKCS7si(self, p7si);
|
GetPKCS7si(self, p7si);
|
||||||
if (!(PKCS7_SIGNER_INFO_set(p7si, x509, pkey, (EVP_MD*)md))) {
|
if (!(PKCS7_SIGNER_INFO_set(p7si, x509, pkey, md))) {
|
||||||
ossl_raise(ePKCS7Error, NULL);
|
ossl_raise(ePKCS7Error, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user