crypto: sm2 - make dependent on sm3 library

[linux-2.6-microblaze.git] / crypto / sm2.c

diff --git a/crypto/sm2.c b/crypto/sm2.c
index db8a4a2..ae3f77a 100644 (file)
--- a/crypto/sm2.c
+++ b/crypto/sm2.c
@@ -13,7 +13,7 @@
 #include <crypto/internal/akcipher.h>
 #include <crypto/akcipher.h>
 #include <crypto/hash.h>
-#include <crypto/sm3_base.h>
+#include <crypto/sm3.h>
 #include <crypto/rng.h>
 #include <crypto/sm2.h>
 #include "sm2signature.asn1.h"
@@ -213,7 +213,7 @@ int sm2_get_signature_s(void *context, size_t hdrlen, unsigned char tag,
        return 0;
 }
 
-static int sm2_z_digest_update(struct shash_desc *desc,
+static int sm2_z_digest_update(struct sm3_state *sctx,
                        MPI m, unsigned int pbytes)
 {
        static const unsigned char zero[32];
@@ -226,20 +226,20 @@ static int sm2_z_digest_update(struct shash_desc *desc,
 
        if (inlen < pbytes) {
                /* padding with zero */
-               crypto_sm3_update(desc, zero, pbytes - inlen);
-               crypto_sm3_update(desc, in, inlen);
+               sm3_update(sctx, zero, pbytes - inlen);
+               sm3_update(sctx, in, inlen);
        } else if (inlen > pbytes) {
                /* skip the starting zero */
-               crypto_sm3_update(desc, in + inlen - pbytes, pbytes);
+               sm3_update(sctx, in + inlen - pbytes, pbytes);
        } else {
-               crypto_sm3_update(desc, in, inlen);
+               sm3_update(sctx, in, inlen);
        }
 
        kfree(in);
        return 0;
 }
 
-static int sm2_z_digest_update_point(struct shash_desc *desc,
+static int sm2_z_digest_update_point(struct sm3_state *sctx,
                MPI_POINT point, struct mpi_ec_ctx *ec, unsigned int pbytes)
 {
        MPI x, y;
@@ -249,8 +249,8 @@ static int sm2_z_digest_update_point(struct shash_desc *desc,
        y = mpi_new(0);
 
        if (!mpi_ec_get_affine(x, y, point, ec) &&
-               !sm2_z_digest_update(desc, x, pbytes) &&
-               !sm2_z_digest_update(desc, y, pbytes))
+           !sm2_z_digest_update(sctx, x, pbytes) &&
+           !sm2_z_digest_update(sctx, y, pbytes))
                ret = 0;
 
        mpi_free(x);
@@ -265,7 +265,7 @@ int sm2_compute_z_digest(struct crypto_akcipher *tfm,
        struct mpi_ec_ctx *ec = akcipher_tfm_ctx(tfm);
        uint16_t bits_len;
        unsigned char entl[2];
-       SHASH_DESC_ON_STACK(desc, NULL);
+       struct sm3_state sctx;
        unsigned int pbytes;
 
        if (id_len > (USHRT_MAX / 8) || !ec->Q)
@@ -278,17 +278,17 @@ int sm2_compute_z_digest(struct crypto_akcipher *tfm,
        pbytes = MPI_NBYTES(ec->p);
 
        /* ZA = H256(ENTLA | IDA | a | b | xG | yG | xA | yA) */
-       sm3_base_init(desc);
-       crypto_sm3_update(desc, entl, 2);
-       crypto_sm3_update(desc, id, id_len);
-
-       if (sm2_z_digest_update(desc, ec->a, pbytes) ||
-               sm2_z_digest_update(desc, ec->b, pbytes) ||
-               sm2_z_digest_update_point(desc, ec->G, ec, pbytes) ||
-               sm2_z_digest_update_point(desc, ec->Q, ec, pbytes))
+       sm3_init(&sctx);
+       sm3_update(&sctx, entl, 2);
+       sm3_update(&sctx, id, id_len);
+
+       if (sm2_z_digest_update(&sctx, ec->a, pbytes) ||
+           sm2_z_digest_update(&sctx, ec->b, pbytes) ||
+           sm2_z_digest_update_point(&sctx, ec->G, ec, pbytes) ||
+           sm2_z_digest_update_point(&sctx, ec->Q, ec, pbytes))
                return -EINVAL;
 
-       crypto_sm3_final(desc, dgst);
+       sm3_final(&sctx, dgst);
        return 0;
 }
 EXPORT_SYMBOL(sm2_compute_z_digest);