We seem to carry some rests of the 0.9.6 [engine] ENGINE framework, here in
form of unneeded direct calls through the engine pointer..
This commit is contained in:
parent
27310553b1
commit
1ed3815650
@ -62,9 +62,6 @@
|
|||||||
#include <openssl/rsa.h>
|
#include <openssl/rsa.h>
|
||||||
#include <openssl/objects.h>
|
#include <openssl/objects.h>
|
||||||
#include <openssl/x509.h>
|
#include <openssl/x509.h>
|
||||||
#ifndef OPENSSL_NO_ENGINE
|
|
||||||
#include <openssl/engine.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Size of an SSL signature: MD5+SHA1 */
|
/* Size of an SSL signature: MD5+SHA1 */
|
||||||
#define SSL_SIG_LENGTH 36
|
#define SSL_SIG_LENGTH 36
|
||||||
@ -81,11 +78,6 @@ int RSA_sign(int type, const unsigned char *m, unsigned int m_len,
|
|||||||
ASN1_OCTET_STRING digest;
|
ASN1_OCTET_STRING digest;
|
||||||
if(rsa->flags & RSA_FLAG_SIGN_VER)
|
if(rsa->flags & RSA_FLAG_SIGN_VER)
|
||||||
{
|
{
|
||||||
#ifndef OPENSSL_NO_ENGINE
|
|
||||||
if(ENGINE_get_RSA(rsa->engine)->rsa_sign)
|
|
||||||
return ENGINE_get_RSA(rsa->engine)->rsa_sign(type,
|
|
||||||
m, m_len, sigret, siglen, rsa);
|
|
||||||
#endif
|
|
||||||
return rsa->meth->rsa_sign(type, m, m_len,
|
return rsa->meth->rsa_sign(type, m, m_len,
|
||||||
sigret, siglen, rsa);
|
sigret, siglen, rsa);
|
||||||
}
|
}
|
||||||
@ -165,11 +157,6 @@ int RSA_verify(int dtype, const unsigned char *m, unsigned int m_len,
|
|||||||
|
|
||||||
if(rsa->flags & RSA_FLAG_SIGN_VER)
|
if(rsa->flags & RSA_FLAG_SIGN_VER)
|
||||||
{
|
{
|
||||||
#ifndef OPENSSL_NO_ENGINE
|
|
||||||
if(ENGINE_get_RSA(rsa->engine)->rsa_verify)
|
|
||||||
return ENGINE_get_RSA(rsa->engine)->rsa_verify(dtype,
|
|
||||||
m, m_len, sigbuf, siglen, rsa);
|
|
||||||
#endif
|
|
||||||
return rsa->meth->rsa_verify(dtype, m, m_len,
|
return rsa->meth->rsa_verify(dtype, m, m_len,
|
||||||
sigbuf, siglen, rsa);
|
sigbuf, siglen, rsa);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user