package/libs/openssl/patches/260-eng_devcrypto-make-sure-digest-can-do-copy.patch

   1 From 488521d77fdc1de5ae256ce0d9203e35ebc92993 Mon Sep 17 00:00:00 2001
   2 From: Eneas U de Queiroz <cote2004-github@yahoo.com>
   3 Date: Sat, 8 Dec 2018 18:01:04 -0200
   4 Subject: [PATCH 7/7] eng_devcrypto: make sure digest can do copy
   5
   6 Digest must be able to do partial-state copy to be used.
   7
   8 Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
   9
  10 Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
  11 Reviewed-by: Richard Levitte <levitte@openssl.org>
  12 (Merged from https://github.com/openssl/openssl/pull/7585)
  13
  14 (cherry picked from commit 16e252a01b754a13e83d5e5e87afbe389997926b)
  15
  16 --- a/crypto/engine/eng_devcrypto.c
  17 +++ b/crypto/engine/eng_devcrypto.c
  18 @@ -601,6 +601,30 @@ static int digest_cleanup(EVP_MD_CTX *ct
  19      return 1;
  20  }
  21
  22 +static int devcrypto_test_digest(size_t digest_data_index)
  23 +{
  24 +    struct session_op sess1, sess2;
  25 +    struct cphash_op cphash;
  26 +    int ret=0;
  27 +
  28 +    memset(&sess1, 0, sizeof(sess1));
  29 +    memset(&sess2, 0, sizeof(sess2));
  30 +    sess1.mac = digest_data[digest_data_index].devcryptoid;
  31 +    if (ioctl(cfd, CIOCGSESSION, &sess1) < 0)
  32 +        return 0;
  33 +    /* Make sure the driver is capable of hash state copy */
  34 +    sess2.mac = sess1.mac;
  35 +    if (ioctl(cfd, CIOCGSESSION, &sess2) >= 0) {
  36 +        cphash.src_ses = sess1.ses;
  37 +        cphash.dst_ses = sess2.ses;
  38 +        if (ioctl(cfd, CIOCCPHASH, &cphash) >= 0)
  39 +            ret = 1;
  40 +        ioctl(cfd, CIOCFSESSION, &sess2.ses);
  41 +    }
  42 +    ioctl(cfd, CIOCFSESSION, &sess1.ses);
  43 +    return ret;
  44 +}
  45 +
  46  /*
  47   * Keep a table of known nids and associated methods.
  48   * Note that known_digest_nids[] isn't necessarily indexed the same way as
  49 @@ -613,20 +637,14 @@ static EVP_MD *known_digest_methods[OSSL
  50  static void prepare_digest_methods(void)
  51  {
  52      size_t i;
  53 -    struct session_op sess;
  54 -
  55 -    memset(&sess, 0, sizeof(sess));
  56
  57      for (i = 0, known_digest_nids_amount = 0; i < OSSL_NELEM(digest_data);
  58           i++) {
  59
  60          /*
  61 -         * Check that the algo is really availably by trying to open and close
  62 -         * a session.
  63 +         * Check that the algo is usable
  64           */
  65 -        sess.mac = digest_data[i].devcryptoid;
  66 -        if (ioctl(cfd, CIOCGSESSION, &sess) < 0
  67 -            || ioctl(cfd, CIOCFSESSION, &sess.ses) < 0)
  68 +        if (!devcrypto_test_digest(i))
  69              continue;
  70
  71          if ((known_digest_methods[i] = EVP_MD_meth_new(digest_data[i].nid,