| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071 |
- From 488521d77fdc1de5ae256ce0d9203e35ebc92993 Mon Sep 17 00:00:00 2001
- From: Eneas U de Queiroz <[email protected]>
- Date: Sat, 8 Dec 2018 18:01:04 -0200
- Subject: [PATCH 7/7] eng_devcrypto: make sure digest can do copy
- Digest must be able to do partial-state copy to be used.
- Signed-off-by: Eneas U de Queiroz <[email protected]>
- Reviewed-by: Matthias St. Pierre <[email protected]>
- Reviewed-by: Richard Levitte <[email protected]>
- (Merged from https://github.com/openssl/openssl/pull/7585)
- (cherry picked from commit 16e252a01b754a13e83d5e5e87afbe389997926b)
- --- a/crypto/engine/eng_devcrypto.c
- +++ b/crypto/engine/eng_devcrypto.c
- @@ -601,6 +601,30 @@ static int digest_cleanup(EVP_MD_CTX *ct
- return 1;
- }
-
- +static int devcrypto_test_digest(size_t digest_data_index)
- +{
- + struct session_op sess1, sess2;
- + struct cphash_op cphash;
- + int ret=0;
- +
- + memset(&sess1, 0, sizeof(sess1));
- + memset(&sess2, 0, sizeof(sess2));
- + sess1.mac = digest_data[digest_data_index].devcryptoid;
- + if (ioctl(cfd, CIOCGSESSION, &sess1) < 0)
- + return 0;
- + /* Make sure the driver is capable of hash state copy */
- + sess2.mac = sess1.mac;
- + if (ioctl(cfd, CIOCGSESSION, &sess2) >= 0) {
- + cphash.src_ses = sess1.ses;
- + cphash.dst_ses = sess2.ses;
- + if (ioctl(cfd, CIOCCPHASH, &cphash) >= 0)
- + ret = 1;
- + ioctl(cfd, CIOCFSESSION, &sess2.ses);
- + }
- + ioctl(cfd, CIOCFSESSION, &sess1.ses);
- + return ret;
- +}
- +
- /*
- * Keep a table of known nids and associated methods.
- * Note that known_digest_nids[] isn't necessarily indexed the same way as
- @@ -613,20 +637,14 @@ static EVP_MD *known_digest_methods[OSSL
- static void prepare_digest_methods(void)
- {
- size_t i;
- - struct session_op sess;
- -
- - memset(&sess, 0, sizeof(sess));
-
- for (i = 0, known_digest_nids_amount = 0; i < OSSL_NELEM(digest_data);
- i++) {
-
- /*
- - * Check that the algo is really availably by trying to open and close
- - * a session.
- + * Check that the algo is usable
- */
- - sess.mac = digest_data[i].devcryptoid;
- - if (ioctl(cfd, CIOCGSESSION, &sess) < 0
- - || ioctl(cfd, CIOCFSESSION, &sess.ses) < 0)
- + if (!devcrypto_test_digest(i))
- continue;
-
- if ((known_digest_methods[i] = EVP_MD_meth_new(digest_data[i].nid,
|
