summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/camellia
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/camellia')
-rw-r--r--src/lib/libcrypto/camellia/camellia.c4
-rw-r--r--src/lib/libcrypto/camellia/cmll_ecb.c4
-rw-r--r--src/lib/libcrypto/camellia/cmll_local.h (renamed from src/lib/libcrypto/camellia/cmll_locl.h)2
-rw-r--r--src/lib/libcrypto/camellia/cmll_misc.c4
4 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/libcrypto/camellia/camellia.c b/src/lib/libcrypto/camellia/camellia.c
index 5f754ff78b..336074ad7c 100644
--- a/src/lib/libcrypto/camellia/camellia.c
+++ b/src/lib/libcrypto/camellia/camellia.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: camellia.c,v 1.11 2016/09/04 14:31:29 jsing Exp $ */ 1/* $OpenBSD: camellia.c,v 1.12 2022/11/26 16:08:51 tb Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright 2006 NTT (Nippon Telegraph and Telephone Corporation) . 3 * Copyright 2006 NTT (Nippon Telegraph and Telephone Corporation) .
4 * ALL RIGHTS RESERVED. 4 * ALL RIGHTS RESERVED.
@@ -87,7 +87,7 @@
87#include <openssl/camellia.h> 87#include <openssl/camellia.h>
88#include <openssl/opensslconf.h> 88#include <openssl/opensslconf.h>
89 89
90#include "cmll_locl.h" 90#include "cmll_local.h"
91 91
92/* 32-bit rotations */ 92/* 32-bit rotations */
93#if !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) 93#if !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
diff --git a/src/lib/libcrypto/camellia/cmll_ecb.c b/src/lib/libcrypto/camellia/cmll_ecb.c
index 1a65445202..b47ece7379 100644
--- a/src/lib/libcrypto/camellia/cmll_ecb.c
+++ b/src/lib/libcrypto/camellia/cmll_ecb.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: cmll_ecb.c,v 1.4 2014/11/13 20:01:58 miod Exp $ */ 1/* $OpenBSD: cmll_ecb.c,v 1.5 2022/11/26 16:08:51 tb Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 2006 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 2006 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -50,7 +50,7 @@
50 */ 50 */
51 51
52#include <openssl/camellia.h> 52#include <openssl/camellia.h>
53#include "cmll_locl.h" 53#include "cmll_local.h"
54 54
55void 55void
56Camellia_ecb_encrypt(const unsigned char *in, unsigned char *out, 56Camellia_ecb_encrypt(const unsigned char *in, unsigned char *out,
diff --git a/src/lib/libcrypto/camellia/cmll_locl.h b/src/lib/libcrypto/camellia/cmll_local.h
index 325b6e2d6f..b8bef6fb75 100644
--- a/src/lib/libcrypto/camellia/cmll_locl.h
+++ b/src/lib/libcrypto/camellia/cmll_local.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: cmll_locl.h,v 1.6 2016/12/21 15:49:29 jsing Exp $ */ 1/* $OpenBSD: cmll_local.h,v 1.1 2022/11/26 16:08:51 tb Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright 2006 NTT (Nippon Telegraph and Telephone Corporation) . 3 * Copyright 2006 NTT (Nippon Telegraph and Telephone Corporation) .
4 * ALL RIGHTS RESERVED. 4 * ALL RIGHTS RESERVED.
diff --git a/src/lib/libcrypto/camellia/cmll_misc.c b/src/lib/libcrypto/camellia/cmll_misc.c
index 2fa61dc637..9fce92df20 100644
--- a/src/lib/libcrypto/camellia/cmll_misc.c
+++ b/src/lib/libcrypto/camellia/cmll_misc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: cmll_misc.c,v 1.6 2014/11/13 20:01:58 miod Exp $ */ 1/* $OpenBSD: cmll_misc.c,v 1.7 2022/11/26 16:08:51 tb Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 2006 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 2006 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -52,7 +52,7 @@
52#include <openssl/opensslv.h> 52#include <openssl/opensslv.h>
53#include <openssl/crypto.h> 53#include <openssl/crypto.h>
54#include <openssl/camellia.h> 54#include <openssl/camellia.h>
55#include "cmll_locl.h" 55#include "cmll_local.h"
56 56
57int 57int
58Camellia_set_key(const unsigned char *userKey, const int bits, 58Camellia_set_key(const unsigned char *userKey, const int bits,