[PATCH 10/10] cipher: remove transitional ctr_enc alias

[Jussi Kivilinna]

* cipher/cipher-internal.h (ctr_enc): Remove transitional alias.
* cipher/rijndael-s390x.c (_gcry_aes_s390x_setup_acceleration): Assign
ctr16be_enc bulk op.
--

All ciphers now assign ctr16be_enc directly, so drop transitional
ctr_enc alias. s390x was last user. Its KMCTR hardware path does full
128-bit counter addition, correct under contract, so only rename needed.

Signed-off-by: Jussi Kivilinna <jussi.kivilinna at iki.fi>
---
 cipher/cipher-internal.h | 5 -----
 cipher/rijndael-s390x.c  | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/cipher/cipher-internal.h b/cipher/cipher-internal.h
index c99bd189..2872b656 100644
--- a/cipher/cipher-internal.h
+++ b/cipher/cipher-internal.h
@@ -209,11 +209,6 @@ typedef struct cipher_bulk_ops
 		      const void *inbuf_arg, size_t nblocks, int encrypt);
 } cipher_bulk_ops_t;
 
-/* Temporary alias for transition period from full 128-bit big-endian
- * counter addition in bulk processing function to 16-bit big-endian
- * addition.  */
-#define ctr_enc ctr16be_enc
-
 
 /* A VIA processor with the Padlock engine as well as the Intel AES_NI
    instructions require an alignment of most data on a 16 byte
diff --git a/cipher/rijndael-s390x.c b/cipher/rijndael-s390x.c
index 0a26020e..f0885179 100644
--- a/cipher/rijndael-s390x.c
+++ b/cipher/rijndael-s390x.c
@@ -1138,7 +1138,7 @@ int _gcry_aes_s390x_setup_acceleration(RIJNDAEL_context *ctx,
 
   if (ctx->kma_func)
     {
-      bulk_ops->ctr_enc = aes_s390x_ctr128_enc;
+      bulk_ops->ctr16be_enc = aes_s390x_ctr128_enc;
 
       if (kimd_query () & km_function_to_mask (KMID_FUNCTION_GHASH))
 	{
-- 
2.53.0