wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

crypto/engine/eng_devcrypto.c: add digest copy

Browse source 
Copying an EVP_MD_CTX, including the implementation local bits, is a
necessary operation.  In this case, though, it's the same as
initializing the local bits to be "copied to".

Fixes #7495

Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/7506)

(cherry picked from commit 36af124bfb)
This commit is contained in:
Richard Levitte 2018-10-27 09:15:04 +02:00
parent b33e7698b8
commit 3dcca12a20
1 changed files with 39 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
crypto/engine/eng_devcrypto.c
View file

@ -329,11 +329,12 @@ static int devcrypto_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
/* /*
* We only support digests if the cryptodev implementation supports multiple * We only support digests if the cryptodev implementation supports multiple
* data updates. Otherwise, we would be forced to maintain a cache, which is * data updates and session copying. Otherwise, we would be forced to maintain
* perilous if there's a lot of data coming in (if someone wants to checksum * a cache, which is perilous if there's a lot of data coming in (if someone
* an OpenSSL tarball, for example). * wants to checksum an OpenSSL tarball, for example).
*/ */
#if defined(COP_FLAG_UPDATE) && defined(COP_FLAG_FINAL) #if defined(CIOCCPHASH) && defined(COP_FLAG_UPDATE) && defined(COP_FLAG_FINAL)
#define IMPLEMENT_DIGEST
/****************************************************************************** /******************************************************************************
* *
@ -480,6 +481,36 @@ static int digest_final(EVP_MD_CTX *ctx, unsigned char *md)
return 1; return 1;
} }
static int digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from)
{
struct digest_ctx *digest_from =
(struct digest_ctx *)EVP_MD_CTX_md_data(from);
struct digest_ctx *digest_to =
(struct digest_ctx *)EVP_MD_CTX_md_data(to);
struct cphash_op cphash;
if (digest_from == NULL)
return 1;
if (digest_from->init != 1) {
SYSerr(SYS_F_IOCTL, EINVAL);
return 0;
}
if (!digest_init(to)) {
SYSerr(SYS_F_IOCTL, errno);
return 0;
}
cphash.src_ses = digest_from->sess.ses;
cphash.dst_ses = digest_to->sess.ses;
if (ioctl(cfd, CIOCCPHASH, &cphash) < 0) {
SYSerr(SYS_F_IOCTL, errno);
return 0;
}
return 1;
}
static int digest_cleanup(EVP_MD_CTX *ctx) static int digest_cleanup(EVP_MD_CTX *ctx)
{ {
struct digest_ctx *digest_ctx = struct digest_ctx *digest_ctx =
@ -532,6 +563,7 @@ static void prepare_digest_methods()
|| !EVP_MD_meth_set_init(known_digest_methods[i], digest_init) || !EVP_MD_meth_set_init(known_digest_methods[i], digest_init)
|| !EVP_MD_meth_set_update(known_digest_methods[i], digest_update) || !EVP_MD_meth_set_update(known_digest_methods[i], digest_update)
|| !EVP_MD_meth_set_final(known_digest_methods[i], digest_final) || !EVP_MD_meth_set_final(known_digest_methods[i], digest_final)
|| !EVP_MD_meth_set_copy(known_digest_methods[i], digest_copy)
|| !EVP_MD_meth_set_cleanup(known_digest_methods[i], digest_cleanup) || !EVP_MD_meth_set_cleanup(known_digest_methods[i], digest_cleanup)
|| !EVP_MD_meth_set_app_datasize(known_digest_methods[i], || !EVP_MD_meth_set_app_datasize(known_digest_methods[i],
sizeof(struct digest_ctx))) { sizeof(struct digest_ctx))) {
@ -598,7 +630,7 @@ static int devcrypto_digests(ENGINE *e, const EVP_MD **digest,
static int devcrypto_unload(ENGINE *e) static int devcrypto_unload(ENGINE *e)
{ {
destroy_all_cipher_methods(); destroy_all_cipher_methods();
#if defined(COP_FLAG_UPDATE) && defined(COP_FLAG_FINAL) #ifdef IMPLEMENT_DIGEST
destroy_all_digest_methods(); destroy_all_digest_methods();
#endif #endif
return 1; return 1;
@ -618,7 +650,7 @@ void engine_load_devcrypto_int()
} }
prepare_cipher_methods(); prepare_cipher_methods();
#if defined(COP_FLAG_UPDATE) && defined(COP_FLAG_FINAL) #ifdef IMPLEMENT_DIGEST
prepare_digest_methods(); prepare_digest_methods();
#endif #endif
@ -664,7 +696,7 @@ void engine_load_devcrypto_int()
# endif # endif
#endif #endif
|| !ENGINE_set_ciphers(e, devcrypto_ciphers) || !ENGINE_set_ciphers(e, devcrypto_ciphers)
#if defined(COP_FLAG_UPDATE) && defined(COP_FLAG_FINAL) #ifdef IMPLEMENT_DIGEST
|| !ENGINE_set_digests(e, devcrypto_digests) || !ENGINE_set_digests(e, devcrypto_digests)
#endif #endif
) { ) {