crypto: user - rename err_cnt parameter

Since now all crypto stats are on their own structures, it is now
useless to have the algorithm name in the err_cnt member.

Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/crypto/algapi.c b/crypto/algapi.c
index a8cb5aed0069b92d4cfa7961b449eca155a0d23f..c0d4f9ef6b0ff5ad22031070246d8f43c95e6ca7 100644 (file)
--- a/crypto/algapi.c
+++ b/crypto/algapi.c
@@ -1083,7 +1083,7 @@ void crypto_stats_ablkcipher_encrypt(unsigned int nbytes, int ret,
                                     struct crypto_alg *alg)
 {
        if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
-               atomic64_inc(&alg->stats.cipher.cipher_err_cnt);
+               atomic64_inc(&alg->stats.cipher.err_cnt);
        } else {
                atomic64_inc(&alg->stats.cipher.encrypt_cnt);
                atomic64_add(nbytes, &alg->stats.cipher.encrypt_tlen);
@@ -1096,7 +1096,7 @@ void crypto_stats_ablkcipher_decrypt(unsigned int nbytes, int ret,
                                     struct crypto_alg *alg)
 {
        if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
-               atomic64_inc(&alg->stats.cipher.cipher_err_cnt);
+               atomic64_inc(&alg->stats.cipher.err_cnt);
        } else {
                atomic64_inc(&alg->stats.cipher.decrypt_cnt);
                atomic64_add(nbytes, &alg->stats.cipher.decrypt_tlen);
@@ -1109,7 +1109,7 @@ void crypto_stats_aead_encrypt(unsigned int cryptlen, struct crypto_alg *alg,
                               int ret)
 {
        if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
-               atomic64_inc(&alg->stats.aead.aead_err_cnt);
+               atomic64_inc(&alg->stats.aead.err_cnt);
        } else {
                atomic64_inc(&alg->stats.aead.encrypt_cnt);
                atomic64_add(cryptlen, &alg->stats.aead.encrypt_tlen);
@@ -1122,7 +1122,7 @@ void crypto_stats_aead_decrypt(unsigned int cryptlen, struct crypto_alg *alg,
                               int ret)
 {
        if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
-               atomic64_inc(&alg->stats.aead.aead_err_cnt);
+               atomic64_inc(&alg->stats.aead.err_cnt);
        } else {
                atomic64_inc(&alg->stats.aead.decrypt_cnt);
                atomic64_add(cryptlen, &alg->stats.aead.decrypt_tlen);
@@ -1135,7 +1135,7 @@ void crypto_stats_akcipher_encrypt(unsigned int src_len, int ret,
                                   struct crypto_alg *alg)
 {
        if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
-               atomic64_inc(&alg->stats.akcipher.akcipher_err_cnt);
+               atomic64_inc(&alg->stats.akcipher.err_cnt);
        } else {
                atomic64_inc(&alg->stats.akcipher.encrypt_cnt);
                atomic64_add(src_len, &alg->stats.akcipher.encrypt_tlen);
@@ -1148,7 +1148,7 @@ void crypto_stats_akcipher_decrypt(unsigned int src_len, int ret,
                                   struct crypto_alg *alg)
 {
        if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
-               atomic64_inc(&alg->stats.akcipher.akcipher_err_cnt);
+               atomic64_inc(&alg->stats.akcipher.err_cnt);
        } else {
                atomic64_inc(&alg->stats.akcipher.decrypt_cnt);
                atomic64_add(src_len, &alg->stats.akcipher.decrypt_tlen);
@@ -1160,7 +1160,7 @@ EXPORT_SYMBOL_GPL(crypto_stats_akcipher_decrypt);
 void crypto_stats_akcipher_sign(int ret, struct crypto_alg *alg)
 {
        if (ret && ret != -EINPROGRESS && ret != -EBUSY)
-               atomic64_inc(&alg->stats.akcipher.akcipher_err_cnt);
+               atomic64_inc(&alg->stats.akcipher.err_cnt);
        else
                atomic64_inc(&alg->stats.akcipher.sign_cnt);
        crypto_alg_put(alg);
@@ -1170,7 +1170,7 @@ EXPORT_SYMBOL_GPL(crypto_stats_akcipher_sign);
 void crypto_stats_akcipher_verify(int ret, struct crypto_alg *alg)
 {
        if (ret && ret != -EINPROGRESS && ret != -EBUSY)
-               atomic64_inc(&alg->stats.akcipher.akcipher_err_cnt);
+               atomic64_inc(&alg->stats.akcipher.err_cnt);
        else
                atomic64_inc(&alg->stats.akcipher.verify_cnt);
        crypto_alg_put(alg);
@@ -1180,7 +1180,7 @@ EXPORT_SYMBOL_GPL(crypto_stats_akcipher_verify);
 void crypto_stats_compress(unsigned int slen, int ret, struct crypto_alg *alg)
 {
        if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
-               atomic64_inc(&alg->stats.compress.compress_err_cnt);
+               atomic64_inc(&alg->stats.compress.err_cnt);
        } else {
                atomic64_inc(&alg->stats.compress.compress_cnt);
                atomic64_add(slen, &alg->stats.compress.compress_tlen);
@@ -1192,7 +1192,7 @@ EXPORT_SYMBOL_GPL(crypto_stats_compress);
 void crypto_stats_decompress(unsigned int slen, int ret, struct crypto_alg *alg)
 {
        if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
-               atomic64_inc(&alg->stats.compress.compress_err_cnt);
+               atomic64_inc(&alg->stats.compress.err_cnt);
        } else {
                atomic64_inc(&alg->stats.compress.decompress_cnt);
                atomic64_add(slen, &alg->stats.compress.decompress_tlen);
@@ -1205,7 +1205,7 @@ void crypto_stats_ahash_update(unsigned int nbytes, int ret,
                               struct crypto_alg *alg)
 {
        if (ret && ret != -EINPROGRESS && ret != -EBUSY)
-               atomic64_inc(&alg->stats.hash.hash_err_cnt);
+               atomic64_inc(&alg->stats.hash.err_cnt);
        else
                atomic64_add(nbytes, &alg->stats.hash.hash_tlen);
        crypto_alg_put(alg);
@@ -1216,7 +1216,7 @@ void crypto_stats_ahash_final(unsigned int nbytes, int ret,
                              struct crypto_alg *alg)
 {
        if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
-               atomic64_inc(&alg->stats.hash.hash_err_cnt);
+               atomic64_inc(&alg->stats.hash.err_cnt);
        } else {
                atomic64_inc(&alg->stats.hash.hash_cnt);
                atomic64_add(nbytes, &alg->stats.hash.hash_tlen);
@@ -1228,7 +1228,7 @@ EXPORT_SYMBOL_GPL(crypto_stats_ahash_final);
 void crypto_stats_kpp_set_secret(struct crypto_alg *alg, int ret)
 {
        if (ret)
-               atomic64_inc(&alg->stats.kpp.kpp_err_cnt);
+               atomic64_inc(&alg->stats.kpp.err_cnt);
        else
                atomic64_inc(&alg->stats.kpp.setsecret_cnt);
        crypto_alg_put(alg);
@@ -1238,7 +1238,7 @@ EXPORT_SYMBOL_GPL(crypto_stats_kpp_set_secret);
 void crypto_stats_kpp_generate_public_key(struct crypto_alg *alg, int ret)
 {
        if (ret)
-               atomic64_inc(&alg->stats.kpp.kpp_err_cnt);
+               atomic64_inc(&alg->stats.kpp.err_cnt);
        else
                atomic64_inc(&alg->stats.kpp.generate_public_key_cnt);
        crypto_alg_put(alg);
@@ -1248,7 +1248,7 @@ EXPORT_SYMBOL_GPL(crypto_stats_kpp_generate_public_key);
 void crypto_stats_kpp_compute_shared_secret(struct crypto_alg *alg, int ret)
 {
        if (ret)
-               atomic64_inc(&alg->stats.kpp.kpp_err_cnt);
+               atomic64_inc(&alg->stats.kpp.err_cnt);
        else
                atomic64_inc(&alg->stats.kpp.compute_shared_secret_cnt);
        crypto_alg_put(alg);
@@ -1258,7 +1258,7 @@ EXPORT_SYMBOL_GPL(crypto_stats_kpp_compute_shared_secret);
 void crypto_stats_rng_seed(struct crypto_alg *alg, int ret)
 {
        if (ret && ret != -EINPROGRESS && ret != -EBUSY)
-               atomic64_inc(&alg->stats.rng.rng_err_cnt);
+               atomic64_inc(&alg->stats.rng.err_cnt);
        else
                atomic64_inc(&alg->stats.rng.seed_cnt);
        crypto_alg_put(alg);
@@ -1269,7 +1269,7 @@ void crypto_stats_rng_generate(struct crypto_alg *alg, unsigned int dlen,
                               int ret)
 {
        if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
-               atomic64_inc(&alg->stats.rng.rng_err_cnt);
+               atomic64_inc(&alg->stats.rng.err_cnt);
        } else {
                atomic64_inc(&alg->stats.rng.generate_cnt);
                atomic64_add(dlen, &alg->stats.rng.generate_tlen);
@@ -1282,7 +1282,7 @@ void crypto_stats_skcipher_encrypt(unsigned int cryptlen, int ret,
                                   struct crypto_alg *alg)
 {
        if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
-               atomic64_inc(&alg->stats.cipher.cipher_err_cnt);
+               atomic64_inc(&alg->stats.cipher.err_cnt);
        } else {
                atomic64_inc(&alg->stats.cipher.encrypt_cnt);
                atomic64_add(cryptlen, &alg->stats.cipher.encrypt_tlen);
@@ -1295,7 +1295,7 @@ void crypto_stats_skcipher_decrypt(unsigned int cryptlen, int ret,
                                   struct crypto_alg *alg)
 {
        if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
-               atomic64_inc(&alg->stats.cipher.cipher_err_cnt);
+               atomic64_inc(&alg->stats.cipher.err_cnt);
        } else {
                atomic64_inc(&alg->stats.cipher.decrypt_cnt);
                atomic64_add(cryptlen, &alg->stats.cipher.decrypt_tlen);

diff --git a/crypto/crypto_user_stat.c b/crypto/crypto_user_stat.c
index 113bf16915603d572483e76ce5b6b8d32cbeee03..0ba00aaeb8106d1c0536c93b7463fe1edf40029d 100644 (file)
--- a/crypto/crypto_user_stat.c
+++ b/crypto/crypto_user_stat.c
@@ -43,7 +43,7 @@ static int crypto_report_aead(struct sk_buff *skb, struct crypto_alg *alg)
        raead.stat_encrypt_tlen = atomic64_read(&alg->stats.aead.encrypt_tlen);
        raead.stat_decrypt_cnt = atomic64_read(&alg->stats.aead.decrypt_cnt);
        raead.stat_decrypt_tlen = atomic64_read(&alg->stats.aead.decrypt_tlen);
-       raead.stat_aead_err_cnt = atomic64_read(&alg->stats.aead.aead_err_cnt);
+       raead.stat_err_cnt = atomic64_read(&alg->stats.aead.err_cnt);
 
        return nla_put(skb, CRYPTOCFGA_STAT_AEAD, sizeof(raead), &raead);
 }
@@ -60,7 +60,7 @@ static int crypto_report_cipher(struct sk_buff *skb, struct crypto_alg *alg)
        rcipher.stat_encrypt_tlen = atomic64_read(&alg->stats.cipher.encrypt_tlen);
        rcipher.stat_decrypt_cnt =  atomic64_read(&alg->stats.cipher.decrypt_cnt);
        rcipher.stat_decrypt_tlen = atomic64_read(&alg->stats.cipher.decrypt_tlen);
-       rcipher.stat_cipher_err_cnt =  atomic64_read(&alg->stats.cipher.cipher_err_cnt);
+       rcipher.stat_err_cnt =  atomic64_read(&alg->stats.cipher.err_cnt);
 
        return nla_put(skb, CRYPTOCFGA_STAT_CIPHER, sizeof(rcipher), &rcipher);
 }
@@ -76,7 +76,7 @@ static int crypto_report_comp(struct sk_buff *skb, struct crypto_alg *alg)
        rcomp.stat_compress_tlen = atomic64_read(&alg->stats.compress.compress_tlen);
        rcomp.stat_decompress_cnt = atomic64_read(&alg->stats.compress.decompress_cnt);
        rcomp.stat_decompress_tlen = atomic64_read(&alg->stats.compress.decompress_tlen);
-       rcomp.stat_compress_err_cnt = atomic64_read(&alg->stats.compress.compress_err_cnt);
+       rcomp.stat_err_cnt = atomic64_read(&alg->stats.compress.err_cnt);
 
        return nla_put(skb, CRYPTOCFGA_STAT_COMPRESS, sizeof(rcomp), &rcomp);
 }
@@ -92,7 +92,7 @@ static int crypto_report_acomp(struct sk_buff *skb, struct crypto_alg *alg)
        racomp.stat_compress_tlen = atomic64_read(&alg->stats.compress.compress_tlen);
        racomp.stat_decompress_cnt =  atomic64_read(&alg->stats.compress.decompress_cnt);
        racomp.stat_decompress_tlen = atomic64_read(&alg->stats.compress.decompress_tlen);
-       racomp.stat_compress_err_cnt = atomic64_read(&alg->stats.compress.compress_err_cnt);
+       racomp.stat_err_cnt = atomic64_read(&alg->stats.compress.err_cnt);
 
        return nla_put(skb, CRYPTOCFGA_STAT_ACOMP, sizeof(racomp), &racomp);
 }
@@ -110,7 +110,7 @@ static int crypto_report_akcipher(struct sk_buff *skb, struct crypto_alg *alg)
        rakcipher.stat_decrypt_tlen = atomic64_read(&alg->stats.akcipher.decrypt_tlen);
        rakcipher.stat_sign_cnt = atomic64_read(&alg->stats.akcipher.sign_cnt);
        rakcipher.stat_verify_cnt = atomic64_read(&alg->stats.akcipher.verify_cnt);
-       rakcipher.stat_akcipher_err_cnt = atomic64_read(&alg->stats.akcipher.akcipher_err_cnt);
+       rakcipher.stat_err_cnt = atomic64_read(&alg->stats.akcipher.err_cnt);
 
        return nla_put(skb, CRYPTOCFGA_STAT_AKCIPHER,
                       sizeof(rakcipher), &rakcipher);
@@ -127,7 +127,7 @@ static int crypto_report_kpp(struct sk_buff *skb, struct crypto_alg *alg)
        rkpp.stat_setsecret_cnt = atomic64_read(&alg->stats.kpp.setsecret_cnt);
        rkpp.stat_generate_public_key_cnt = atomic64_read(&alg->stats.kpp.generate_public_key_cnt);
        rkpp.stat_compute_shared_secret_cnt = atomic64_read(&alg->stats.kpp.compute_shared_secret_cnt);
-       rkpp.stat_kpp_err_cnt = atomic64_read(&alg->stats.kpp.kpp_err_cnt);
+       rkpp.stat_err_cnt = atomic64_read(&alg->stats.kpp.err_cnt);
 
        return nla_put(skb, CRYPTOCFGA_STAT_KPP, sizeof(rkpp), &rkpp);
 }
@@ -142,7 +142,7 @@ static int crypto_report_ahash(struct sk_buff *skb, struct crypto_alg *alg)
 
        rhash.stat_hash_cnt = atomic64_read(&alg->stats.hash.hash_cnt);
        rhash.stat_hash_tlen = atomic64_read(&alg->stats.hash.hash_tlen);
-       rhash.stat_hash_err_cnt = atomic64_read(&alg->stats.hash.hash_err_cnt);
+       rhash.stat_err_cnt = atomic64_read(&alg->stats.hash.err_cnt);
 
        return nla_put(skb, CRYPTOCFGA_STAT_HASH, sizeof(rhash), &rhash);
 }
@@ -157,7 +157,7 @@ static int crypto_report_shash(struct sk_buff *skb, struct crypto_alg *alg)
 
        rhash.stat_hash_cnt =  atomic64_read(&alg->stats.hash.hash_cnt);
        rhash.stat_hash_tlen = atomic64_read(&alg->stats.hash.hash_tlen);
-       rhash.stat_hash_err_cnt = atomic64_read(&alg->stats.hash.hash_err_cnt);
+       rhash.stat_err_cnt = atomic64_read(&alg->stats.hash.err_cnt);
 
        return nla_put(skb, CRYPTOCFGA_STAT_HASH, sizeof(rhash), &rhash);
 }
@@ -173,7 +173,7 @@ static int crypto_report_rng(struct sk_buff *skb, struct crypto_alg *alg)
        rrng.stat_generate_cnt = atomic64_read(&alg->stats.rng.generate_cnt);
        rrng.stat_generate_tlen = atomic64_read(&alg->stats.rng.generate_tlen);
        rrng.stat_seed_cnt = atomic64_read(&alg->stats.rng.seed_cnt);
-       rrng.stat_rng_err_cnt = atomic64_read(&alg->stats.rng.rng_err_cnt);
+       rrng.stat_err_cnt = atomic64_read(&alg->stats.rng.err_cnt);
 
        return nla_put(skb, CRYPTOCFGA_STAT_RNG, sizeof(rrng), &rrng);
 }

diff --git a/include/linux/crypto.h b/include/linux/crypto.h
index 8a46ab35479e8a8efdce74a1b3568eb5ea7e6696..a2967c1a08b149c280376ffb0db90427b792e8bb 100644 (file)
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
@@ -376,14 +376,14 @@ struct compress_alg {
  * @encrypt_tlen:      total data size handled by encrypt requests
  * @decrypt_cnt:       number of decrypt requests
  * @decrypt_tlen:      total data size handled by decrypt requests
- * @aead_err_cnt:      number of error for AEAD requests
+ * @err_cnt:           number of error for AEAD requests
  */
 struct crypto_istat_aead {
        atomic64_t encrypt_cnt;
        atomic64_t encrypt_tlen;
        atomic64_t decrypt_cnt;
        atomic64_t decrypt_tlen;
-       atomic64_t aead_err_cnt;
+       atomic64_t err_cnt;
 };
 
 /*
@@ -394,7 +394,7 @@ struct crypto_istat_aead {
  * @decrypt_tlen:      total data size handled by decrypt requests
  * @verify_cnt:                number of verify operation
  * @sign_cnt:          number of sign requests
- * @akcipher_err_cnt:  number of error for akcipher requests
+ * @err_cnt:           number of error for akcipher requests
  */
 struct crypto_istat_akcipher {
        atomic64_t encrypt_cnt;
@@ -403,7 +403,7 @@ struct crypto_istat_akcipher {
        atomic64_t decrypt_tlen;
        atomic64_t verify_cnt;
        atomic64_t sign_cnt;
-       atomic64_t akcipher_err_cnt;
+       atomic64_t err_cnt;
 };
 
 /*
@@ -412,14 +412,14 @@ struct crypto_istat_akcipher {
  * @encrypt_tlen:      total data size handled by encrypt requests
  * @decrypt_cnt:       number of decrypt requests
  * @decrypt_tlen:      total data size handled by decrypt requests
- * @cipher_err_cnt:    number of error for cipher requests
+ * @err_cnt:           number of error for cipher requests
  */
 struct crypto_istat_cipher {
        atomic64_t encrypt_cnt;
        atomic64_t encrypt_tlen;
        atomic64_t decrypt_cnt;
        atomic64_t decrypt_tlen;
-       atomic64_t cipher_err_cnt;
+       atomic64_t err_cnt;
 };
 
 /*
@@ -428,26 +428,26 @@ struct crypto_istat_cipher {
  * @compress_tlen:     total data size handled by compress requests
  * @decompress_cnt:    number of decompress requests
  * @decompress_tlen:   total data size handled by decompress requests
- * @compress_err_cnt:  number of error for compress requests
+ * @err_cnt:           number of error for compress requests
  */
 struct crypto_istat_compress {
        atomic64_t compress_cnt;
        atomic64_t compress_tlen;
        atomic64_t decompress_cnt;
        atomic64_t decompress_tlen;
-       atomic64_t compress_err_cnt;
+       atomic64_t err_cnt;
 };
 
 /*
  * struct crypto_istat_hash - statistics for has algorithm
  * @hash_cnt:          number of hash requests
  * @hash_tlen:         total data size hashed
- * @hash_err_cnt:      number of error for hash requests
+ * @err_cnt:           number of error for hash requests
  */
 struct crypto_istat_hash {
        atomic64_t hash_cnt;
        atomic64_t hash_tlen;
-       atomic64_t hash_err_cnt;
+       atomic64_t err_cnt;
 };
 
 /*
@@ -455,13 +455,13 @@ struct crypto_istat_hash {
  * @setsecret_cnt:             number of setsecrey operation
  * @generate_public_key_cnt:   number of generate_public_key operation
  * @compute_shared_secret_cnt: number of compute_shared_secret operation
- * @kpp_err_cnt:               number of error for KPP requests
+ * @err_cnt:                   number of error for KPP requests
  */
 struct crypto_istat_kpp {
        atomic64_t setsecret_cnt;
        atomic64_t generate_public_key_cnt;
        atomic64_t compute_shared_secret_cnt;
-       atomic64_t kpp_err_cnt;
+       atomic64_t err_cnt;
 };
 
 /*
@@ -469,13 +469,13 @@ struct crypto_istat_kpp {
  * @generate_cnt:      number of RNG generate requests
  * @generate_tlen:     total data size of generated data by the RNG
  * @seed_cnt:          number of times the RNG was seeded
- * @rng_err_cnt:       number of error for RNG requests
+ * @err_cnt:           number of error for RNG requests
  */
 struct crypto_istat_rng {
        atomic64_t generate_cnt;
        atomic64_t generate_tlen;
        atomic64_t seed_cnt;
-       atomic64_t rng_err_cnt;
+       atomic64_t err_cnt;
 };
 #endif /* CONFIG_CRYPTO_STATS */
 

diff --git a/include/uapi/linux/cryptouser.h b/include/uapi/linux/cryptouser.h
index 3a70f025e27d6827a45735a741b4b21761689f38..4dc1603919ce85ee1536bf7cdaa2769f9d45018a 100644 (file)
--- a/include/uapi/linux/cryptouser.h
+++ b/include/uapi/linux/cryptouser.h
@@ -82,7 +82,7 @@ struct crypto_stat_aead {
        __u64 stat_encrypt_tlen;
        __u64 stat_decrypt_cnt;
        __u64 stat_decrypt_tlen;
-       __u64 stat_aead_err_cnt;
+       __u64 stat_err_cnt;
 };
 
 struct crypto_stat_akcipher {
@@ -93,7 +93,7 @@ struct crypto_stat_akcipher {
        __u64 stat_decrypt_tlen;
        __u64 stat_verify_cnt;
        __u64 stat_sign_cnt;
-       __u64 stat_akcipher_err_cnt;
+       __u64 stat_err_cnt;
 };
 
 struct crypto_stat_cipher {
@@ -102,7 +102,7 @@ struct crypto_stat_cipher {
        __u64 stat_encrypt_tlen;
        __u64 stat_decrypt_cnt;
        __u64 stat_decrypt_tlen;
-       __u64 stat_cipher_err_cnt;
+       __u64 stat_err_cnt;
 };
 
 struct crypto_stat_compress {
@@ -111,14 +111,14 @@ struct crypto_stat_compress {
        __u64 stat_compress_tlen;
        __u64 stat_decompress_cnt;
        __u64 stat_decompress_tlen;
-       __u64 stat_compress_err_cnt;
+       __u64 stat_err_cnt;
 };
 
 struct crypto_stat_hash {
        char type[CRYPTO_MAX_NAME];
        __u64 stat_hash_cnt;
        __u64 stat_hash_tlen;
-       __u64 stat_hash_err_cnt;
+       __u64 stat_err_cnt;
 };
 
 struct crypto_stat_kpp {
@@ -126,7 +126,7 @@ struct crypto_stat_kpp {
        __u64 stat_setsecret_cnt;
        __u64 stat_generate_public_key_cnt;
        __u64 stat_compute_shared_secret_cnt;
-       __u64 stat_kpp_err_cnt;
+       __u64 stat_err_cnt;
 };
 
 struct crypto_stat_rng {
@@ -134,7 +134,7 @@ struct crypto_stat_rng {
        __u64 stat_generate_cnt;
        __u64 stat_generate_tlen;
        __u64 stat_seed_cnt;
-       __u64 stat_rng_err_cnt;
+       __u64 stat_err_cnt;
 };
 
 struct crypto_stat_larval {

diff --git a/tools/crypto/getstat.c b/tools/crypto/getstat.c
index 57fbb94608d41f180037ce6d5bcb591f1dcd3b61..9e8ff76420fa5636df917d10475f15d5d0769e3e 100644 (file)
--- a/tools/crypto/getstat.c
+++ b/tools/crypto/getstat.c
@@ -157,7 +157,7 @@ static int get_stat(const char *drivername)
                printf("%s\tHash\n\tHash: %llu bytes: %llu\n\tErrors: %llu\n",
                        drivername,
                        rhash->stat_hash_cnt, rhash->stat_hash_tlen,
-                       rhash->stat_hash_err_cnt);
+                       rhash->stat_err_cnt);
        } else if (tb[CRYPTOCFGA_STAT_COMPRESS]) {
                struct rtattr *rta = tb[CRYPTOCFGA_STAT_COMPRESS];
                struct crypto_stat_compress *rblk =
@@ -166,7 +166,7 @@ static int get_stat(const char *drivername)
                        drivername,
                        rblk->stat_compress_cnt, rblk->stat_compress_tlen,
                        rblk->stat_decompress_cnt, rblk->stat_decompress_tlen,
-                       rblk->stat_compress_err_cnt);
+                       rblk->stat_err_cnt);
        } else if (tb[CRYPTOCFGA_STAT_ACOMP]) {
                struct rtattr *rta = tb[CRYPTOCFGA_STAT_ACOMP];
                struct crypto_stat_compress *rcomp =
@@ -175,7 +175,7 @@ static int get_stat(const char *drivername)
                        drivername,
                        rcomp->stat_compress_cnt, rcomp->stat_compress_tlen,
                        rcomp->stat_decompress_cnt, rcomp->stat_decompress_tlen,
-                       rcomp->stat_compress_err_cnt);
+                       rcomp->stat_err_cnt);
        } else if (tb[CRYPTOCFGA_STAT_AEAD]) {
                struct rtattr *rta = tb[CRYPTOCFGA_STAT_AEAD];
                struct crypto_stat_aead *raead =
@@ -184,7 +184,7 @@ static int get_stat(const char *drivername)
                        drivername,
                        raead->stat_encrypt_cnt, raead->stat_encrypt_tlen,
                        raead->stat_decrypt_cnt, raead->stat_decrypt_tlen,
-                       raead->stat_aead_err_cnt);
+                       raead->stat_err_cnt);
        } else if (tb[CRYPTOCFGA_STAT_BLKCIPHER]) {
                struct rtattr *rta = tb[CRYPTOCFGA_STAT_BLKCIPHER];
                struct crypto_stat_cipher *rblk =
@@ -193,7 +193,7 @@ static int get_stat(const char *drivername)
                        drivername,
                        rblk->stat_encrypt_cnt, rblk->stat_encrypt_tlen,
                        rblk->stat_decrypt_cnt, rblk->stat_decrypt_tlen,
-                       rblk->stat_cipher_err_cnt);
+                       rblk->stat_err_cnt);
        } else if (tb[CRYPTOCFGA_STAT_AKCIPHER]) {
                struct rtattr *rta = tb[CRYPTOCFGA_STAT_AKCIPHER];
                struct crypto_stat_akcipher *rblk =
@@ -203,7 +203,7 @@ static int get_stat(const char *drivername)
                        rblk->stat_encrypt_cnt, rblk->stat_encrypt_tlen,
                        rblk->stat_decrypt_cnt, rblk->stat_decrypt_tlen,
                        rblk->stat_sign_cnt, rblk->stat_verify_cnt,
-                       rblk->stat_akcipher_err_cnt);
+                       rblk->stat_err_cnt);
        } else if (tb[CRYPTOCFGA_STAT_CIPHER]) {
                struct rtattr *rta = tb[CRYPTOCFGA_STAT_CIPHER];
                struct crypto_stat_cipher *rblk =
@@ -212,7 +212,7 @@ static int get_stat(const char *drivername)
                        drivername,
                        rblk->stat_encrypt_cnt, rblk->stat_encrypt_tlen,
                        rblk->stat_decrypt_cnt, rblk->stat_decrypt_tlen,
-                       rblk->stat_cipher_err_cnt);
+                       rblk->stat_err_cnt);
        } else if (tb[CRYPTOCFGA_STAT_RNG]) {
                struct rtattr *rta = tb[CRYPTOCFGA_STAT_RNG];
                struct crypto_stat_rng *rrng =
@@ -221,7 +221,7 @@ static int get_stat(const char *drivername)
                        drivername,
                        rrng->stat_seed_cnt,
                        rrng->stat_generate_cnt, rrng->stat_generate_tlen,
-                       rrng->stat_rng_err_cnt);
+                       rrng->stat_err_cnt);
        } else if (tb[CRYPTOCFGA_STAT_KPP]) {
                struct rtattr *rta = tb[CRYPTOCFGA_STAT_KPP];
                struct crypto_stat_kpp *rkpp =
@@ -231,7 +231,7 @@ static int get_stat(const char *drivername)
                        rkpp->stat_setsecret_cnt,
                        rkpp->stat_generate_public_key_cnt,
                        rkpp->stat_compute_shared_secret_cnt,
-                       rkpp->stat_kpp_err_cnt);
+                       rkpp->stat_err_cnt);
        } else {
                fprintf(stderr, "%s is of an unknown algorithm\n", drivername);
        }