1 files changed, 17 insertions, 21 deletions

diff --git a/src/lib/libcrypto/evp/e_camellia.c b/src/lib/libcrypto/evp/e_camellia.c
index 42c036a7ab..2d7ab73627 100644
--- a/src/lib/libcrypto/evp/e_camellia.c
+++ b/src/lib/libcrypto/evp/e_camellia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: e_camellia.c,v 1.11 2022/09/04 07:54:59 jsing Exp $ */
+/* $OpenBSD: e_camellia.c,v 1.12 2022/09/04 13:17:18 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
  *
@@ -64,9 +64,6 @@
 
 #include "evp_locl.h"
 
-static int camellia_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-    const unsigned char *iv, int enc);
-
 /* Camellia subkey Structure */
 typedef struct {
         CAMELLIA_KEY ks;
@@ -76,6 +73,22 @@ typedef struct {
 #define data(ctx)       ((EVP_CAMELLIA_KEY *)(ctx)->cipher_data)
 
 static int
+camellia_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+    const unsigned char *iv, int enc)
+{
+        int ret;
+
+        ret = Camellia_set_key(key, ctx->key_len * 8, ctx->cipher_data);
+
+        if (ret < 0) {
+                EVPerror(EVP_R_CAMELLIA_KEY_SETUP_FAILED);
+                return 0;
+        }
+
+        return 1;
+}
+
+static int
 camellia_128_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl)
 {
         while (inl >= EVP_MAXCHUNK) {
@@ -828,21 +841,4 @@ EVP_camellia_256_cfb8(void)
 {
         return &camellia_256_cfb8;
 }
-
-/* The subkey for Camellia is generated. */
-static int
-camellia_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-    const unsigned char *iv, int enc)
-{
-        int ret;
-
-        ret = Camellia_set_key(key, ctx->key_len * 8, ctx->cipher_data);
-
-        if (ret < 0) {
-                EVPerror(EVP_R_CAMELLIA_KEY_SETUP_FAILED);
-                return 0;
-        }
-
-        return 1;
-}
 #endif