From 4d8aad265e0bce5f4a5bcc87694b12ce1188747f Mon Sep 17 00:00:00 2001 From: joshua Date: Fri, 29 Mar 2024 01:47:29 +0000 Subject: [PATCH] Hide symbols in DES ok jsing beck --- lib/libcrypto/Symbols.namespace | 35 ++++++++++++++++ lib/libcrypto/des/cbc_cksm.c | 3 +- lib/libcrypto/des/cfb64ede.c | 4 +- lib/libcrypto/des/cfb64enc.c | 3 +- lib/libcrypto/des/cfb_enc.c | 3 +- lib/libcrypto/des/des_enc.c | 7 +++- lib/libcrypto/des/ecb3_enc.c | 3 +- lib/libcrypto/des/ecb_enc.c | 3 +- lib/libcrypto/des/ede_cbcm_enc.c | 3 +- lib/libcrypto/des/enc_read.c | 3 +- lib/libcrypto/des/enc_writ.c | 3 +- lib/libcrypto/des/fcrypt.c | 4 +- lib/libcrypto/des/ncbc_enc.c | 7 +++- lib/libcrypto/des/ofb64ede.c | 3 +- lib/libcrypto/des/ofb64enc.c | 3 +- lib/libcrypto/des/ofb_enc.c | 3 +- lib/libcrypto/des/pcbc_enc.c | 3 +- lib/libcrypto/des/qud_cksm.c | 3 +- lib/libcrypto/des/set_key.c | 10 ++++- lib/libcrypto/des/str2key.c | 4 +- lib/libcrypto/des/xcbc_enc.c | 3 +- lib/libcrypto/hidden/openssl/des.h | 64 ++++++++++++++++++++++++++++++ 22 files changed, 157 insertions(+), 20 deletions(-) create mode 100644 lib/libcrypto/hidden/openssl/des.h diff --git a/lib/libcrypto/Symbols.namespace b/lib/libcrypto/Symbols.namespace index 48dfbe5fd79..336989e983e 100644 --- a/lib/libcrypto/Symbols.namespace +++ b/lib/libcrypto/Symbols.namespace @@ -2549,3 +2549,38 @@ _libre_RIPEMD160_Update _libre_RIPEMD160_Final _libre_RIPEMD160 _libre_RIPEMD160_Transform +_libre_DES_ecb3_encrypt +_libre_DES_cbc_cksum +_libre_DES_cbc_encrypt +_libre_DES_ncbc_encrypt +_libre_DES_xcbc_encrypt +_libre_DES_cfb_encrypt +_libre_DES_ecb_encrypt +_libre_DES_encrypt1 +_libre_DES_encrypt2 +_libre_DES_encrypt3 +_libre_DES_decrypt3 +_libre_DES_ede3_cbc_encrypt +_libre_DES_ede3_cbcm_encrypt +_libre_DES_ede3_cfb64_encrypt +_libre_DES_ede3_cfb_encrypt +_libre_DES_ede3_ofb64_encrypt +_libre_DES_enc_read +_libre_DES_enc_write +_libre_DES_fcrypt +_libre_DES_crypt +_libre_DES_ofb_encrypt +_libre_DES_pcbc_encrypt +_libre_DES_quad_cksum +_libre_DES_random_key +_libre_DES_set_odd_parity +_libre_DES_check_key_parity +_libre_DES_is_weak_key +_libre_DES_set_key +_libre_DES_key_sched +_libre_DES_set_key_checked +_libre_DES_set_key_unchecked +_libre_DES_string_to_key +_libre_DES_string_to_2keys +_libre_DES_cfb64_encrypt +_libre_DES_ofb64_encrypt diff --git a/lib/libcrypto/des/cbc_cksm.c b/lib/libcrypto/des/cbc_cksm.c index afa3f03d92d..acb0bac110b 100644 --- a/lib/libcrypto/des/cbc_cksm.c +++ b/lib/libcrypto/des/cbc_cksm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cbc_cksm.c,v 1.10 2023/07/08 07:34:34 jsing Exp $ */ +/* $OpenBSD: cbc_cksm.c,v 1.11 2024/03/29 01:47:29 joshua Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -103,3 +103,4 @@ DES_cbc_cksum(const unsigned char *in, DES_cblock *output, ((tout1 << 24L) & 0xFF000000); return (tout1); } +LCRYPTO_ALIAS(DES_cbc_cksum); diff --git a/lib/libcrypto/des/cfb64ede.c b/lib/libcrypto/des/cfb64ede.c index e91dbbfc4a4..69a6c254087 100644 --- a/lib/libcrypto/des/cfb64ede.c +++ b/lib/libcrypto/des/cfb64ede.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cfb64ede.c,v 1.12 2023/07/08 07:34:34 jsing Exp $ */ +/* $OpenBSD: cfb64ede.c,v 1.13 2024/03/29 01:47:29 joshua Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -125,6 +125,7 @@ DES_ede3_cfb64_encrypt(const unsigned char *in, unsigned char *out, v0 = v1 = ti[0] = ti[1] = c = cc = 0; *num = n; } +LCRYPTO_ALIAS(DES_ede3_cfb64_encrypt); /* This is compatible with the single key CFB-r for DES, even thought that's * not what EVP needs. @@ -238,3 +239,4 @@ DES_ede3_cfb_encrypt(const unsigned char *in, unsigned char *out, l2c(v1, iv); v0 = v1 = d0 = d1 = ti[0] = ti[1] = 0; } +LCRYPTO_ALIAS(DES_ede3_cfb_encrypt); diff --git a/lib/libcrypto/des/cfb64enc.c b/lib/libcrypto/des/cfb64enc.c index d7434b9db98..d2d0dadf111 100644 --- a/lib/libcrypto/des/cfb64enc.c +++ b/lib/libcrypto/des/cfb64enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cfb64enc.c,v 1.8 2023/07/08 07:11:07 beck Exp $ */ +/* $OpenBSD: cfb64enc.c,v 1.9 2024/03/29 01:47:29 joshua Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -120,3 +120,4 @@ DES_cfb64_encrypt(const unsigned char *in, unsigned char *out, v0 = v1 = ti[0] = ti[1] = c = cc = 0; *num = n; } +LCRYPTO_ALIAS(DES_cfb64_encrypt); diff --git a/lib/libcrypto/des/cfb_enc.c b/lib/libcrypto/des/cfb_enc.c index dac86751d3b..ae41c9d079b 100644 --- a/lib/libcrypto/des/cfb_enc.c +++ b/lib/libcrypto/des/cfb_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cfb_enc.c,v 1.16 2023/07/08 07:11:07 beck Exp $ */ +/* $OpenBSD: cfb_enc.c,v 1.17 2024/03/29 01:47:29 joshua Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -187,3 +187,4 @@ DES_cfb_encrypt(const unsigned char *in, unsigned char *out, int numbits, l2c(v1, iv); v0 = v1 = d0 = d1 = ti[0] = ti[1] = 0; } +LCRYPTO_ALIAS(DES_cfb_encrypt); diff --git a/lib/libcrypto/des/des_enc.c b/lib/libcrypto/des/des_enc.c index 7319639c82a..f332b9a431a 100644 --- a/lib/libcrypto/des/des_enc.c +++ b/lib/libcrypto/des/des_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: des_enc.c,v 1.15 2023/07/08 07:34:34 jsing Exp $ */ +/* $OpenBSD: des_enc.c,v 1.16 2024/03/29 01:47:29 joshua Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -150,6 +150,7 @@ DES_encrypt1(DES_LONG *data, DES_key_schedule *ks, int enc) data[1] = r; l = r = t = u = 0; } +LCRYPTO_ALIAS(DES_encrypt1); void DES_encrypt2(DES_LONG *data, DES_key_schedule *ks, int enc) @@ -233,6 +234,7 @@ DES_encrypt2(DES_LONG *data, DES_key_schedule *ks, int enc) data[1] = ROTATE(r, 3) & 0xffffffffL; l = r = t = u = 0; } +LCRYPTO_ALIAS(DES_encrypt2); #endif /* OPENBSD_DES_ASM */ @@ -256,6 +258,7 @@ DES_encrypt3(DES_LONG *data, DES_key_schedule *ks1, data[0] = l; data[1] = r; } +LCRYPTO_ALIAS(DES_encrypt3); void DES_decrypt3(DES_LONG *data, DES_key_schedule *ks1, @@ -277,6 +280,7 @@ DES_decrypt3(DES_LONG *data, DES_key_schedule *ks1, data[0] = l; data[1] = r; } +LCRYPTO_ALIAS(DES_decrypt3); #ifndef DES_DEFAULT_OPTIONS @@ -388,5 +392,6 @@ DES_ede3_cbc_encrypt(const unsigned char *input, unsigned char *output, tin0 = tin1 = tout0 = tout1 = xor0 = xor1 = 0; tin[0] = tin[1] = 0; } +LCRYPTO_ALIAS(DES_ede3_cbc_encrypt); #endif /* DES_DEFAULT_OPTIONS */ diff --git a/lib/libcrypto/des/ecb3_enc.c b/lib/libcrypto/des/ecb3_enc.c index 129b5fafeae..2aa63726e5b 100644 --- a/lib/libcrypto/des/ecb3_enc.c +++ b/lib/libcrypto/des/ecb3_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ecb3_enc.c,v 1.9 2023/07/08 07:11:07 beck Exp $ */ +/* $OpenBSD: ecb3_enc.c,v 1.10 2024/03/29 01:47:29 joshua Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -82,3 +82,4 @@ DES_ecb3_encrypt(const_DES_cblock *input, DES_cblock *output, l2c(l0, out); l2c(l1, out); } +LCRYPTO_ALIAS(DES_ecb3_encrypt); diff --git a/lib/libcrypto/des/ecb_enc.c b/lib/libcrypto/des/ecb_enc.c index 3599fb812fb..2491c43183c 100644 --- a/lib/libcrypto/des/ecb_enc.c +++ b/lib/libcrypto/des/ecb_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ecb_enc.c,v 1.19 2023/07/31 05:04:06 tb Exp $ */ +/* $OpenBSD: ecb_enc.c,v 1.20 2024/03/29 01:47:29 joshua Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -80,3 +80,4 @@ DES_ecb_encrypt(const_DES_cblock *input, DES_cblock *output, l2c(l, out); l = ll[0] = ll[1] = 0; } +LCRYPTO_ALIAS(DES_ecb_encrypt); diff --git a/lib/libcrypto/des/ede_cbcm_enc.c b/lib/libcrypto/des/ede_cbcm_enc.c index eb6fd4f5452..979600e549c 100644 --- a/lib/libcrypto/des/ede_cbcm_enc.c +++ b/lib/libcrypto/des/ede_cbcm_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ede_cbcm_enc.c,v 1.9 2023/07/08 07:34:34 jsing Exp $ */ +/* $OpenBSD: ede_cbcm_enc.c,v 1.10 2024/03/29 01:47:29 joshua Exp $ */ /* Written by Ben Laurie for the OpenSSL * project 13 Feb 1999. */ @@ -186,4 +186,5 @@ DES_ede3_cbcm_encrypt(const unsigned char *in, unsigned char *out, tin0 = tin1 = tout0 = tout1 = xor0 = xor1 = 0; tin[0] = tin[1] = 0; } +LCRYPTO_ALIAS(DES_ede3_cbcm_encrypt); #endif diff --git a/lib/libcrypto/des/enc_read.c b/lib/libcrypto/des/enc_read.c index 8095f265c09..d52489e72d0 100644 --- a/lib/libcrypto/des/enc_read.c +++ b/lib/libcrypto/des/enc_read.c @@ -1,4 +1,4 @@ -/* $OpenBSD: enc_read.c,v 1.17 2023/07/08 07:11:07 beck Exp $ */ +/* $OpenBSD: enc_read.c,v 1.18 2024/03/29 01:47:29 joshua Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -220,3 +220,4 @@ DES_enc_read(int fd, void *buf, int len, DES_key_schedule *sched, } return num; } +LCRYPTO_ALIAS(DES_enc_read); diff --git a/lib/libcrypto/des/enc_writ.c b/lib/libcrypto/des/enc_writ.c index 3def8a8d73b..39c61393609 100644 --- a/lib/libcrypto/des/enc_writ.c +++ b/lib/libcrypto/des/enc_writ.c @@ -1,4 +1,4 @@ -/* $OpenBSD: enc_writ.c,v 1.17 2023/07/08 07:34:34 jsing Exp $ */ +/* $OpenBSD: enc_writ.c,v 1.18 2024/03/29 01:47:29 joshua Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -165,3 +165,4 @@ DES_enc_write(int fd, const void *_buf, int len, return (len); } +LCRYPTO_ALIAS(DES_enc_write); diff --git a/lib/libcrypto/des/fcrypt.c b/lib/libcrypto/des/fcrypt.c index b183ceef147..5bdf09b7e66 100644 --- a/lib/libcrypto/des/fcrypt.c +++ b/lib/libcrypto/des/fcrypt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fcrypt.c,v 1.15 2023/07/08 07:34:34 jsing Exp $ */ +/* $OpenBSD: fcrypt.c,v 1.16 2024/03/29 01:47:29 joshua Exp $ */ #include @@ -58,6 +58,7 @@ DES_crypt(const char *buf, const char *salt) return (DES_fcrypt(buf, salt, buff)); } +LCRYPTO_ALIAS(DES_crypt); char * DES_fcrypt(const char *buf, const char *salt, char *ret) @@ -123,3 +124,4 @@ r=(r+7)/8; ret[13] = '\0'; return (ret); } +LCRYPTO_ALIAS(DES_fcrypt); diff --git a/lib/libcrypto/des/ncbc_enc.c b/lib/libcrypto/des/ncbc_enc.c index c4da94c4892..1a49126b636 100644 --- a/lib/libcrypto/des/ncbc_enc.c +++ b/lib/libcrypto/des/ncbc_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ncbc_enc.c,v 1.10 2023/07/08 07:34:34 jsing Exp $ */ +/* $OpenBSD: ncbc_enc.c,v 1.11 2024/03/29 01:47:29 joshua Exp $ */ /* * #included by: * cbc_enc.c (DES_cbc_encrypt) @@ -153,3 +153,8 @@ DES_ncbc_encrypt(const unsigned char *in, unsigned char *out, long length, tin0 = tin1 = tout0 = tout1 = xor0 = xor1 = 0; tin[0] = tin[1] = 0; } +#ifdef CBC_ENC_C__DONT_UPDATE_IV +LCRYPTO_ALIAS(DES_cbc_encrypt); +#else +LCRYPTO_ALIAS(DES_ncbc_encrypt); +#endif diff --git a/lib/libcrypto/des/ofb64ede.c b/lib/libcrypto/des/ofb64ede.c index 2922fc77fa9..949b2204789 100644 --- a/lib/libcrypto/des/ofb64ede.c +++ b/lib/libcrypto/des/ofb64ede.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ofb64ede.c,v 1.8 2023/07/08 07:11:07 beck Exp $ */ +/* $OpenBSD: ofb64ede.c,v 1.9 2024/03/29 01:47:29 joshua Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -110,3 +110,4 @@ DES_ede3_ofb64_encrypt(const unsigned char *in, v0 = v1 = ti[0] = ti[1] = 0; *num = n; } +LCRYPTO_ALIAS(DES_ede3_ofb64_encrypt); diff --git a/lib/libcrypto/des/ofb64enc.c b/lib/libcrypto/des/ofb64enc.c index c3b1b8af8ba..5e524dd9e2f 100644 --- a/lib/libcrypto/des/ofb64enc.c +++ b/lib/libcrypto/des/ofb64enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ofb64enc.c,v 1.8 2023/07/08 07:11:07 beck Exp $ */ +/* $OpenBSD: ofb64enc.c,v 1.9 2024/03/29 01:47:29 joshua Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -107,3 +107,4 @@ DES_ofb64_encrypt(const unsigned char *in, t = v0 = v1 = ti[0] = ti[1] = 0; *num = n; } +LCRYPTO_ALIAS(DES_ofb64_encrypt); diff --git a/lib/libcrypto/des/ofb_enc.c b/lib/libcrypto/des/ofb_enc.c index 990b927eb04..96dc25ee2ca 100644 --- a/lib/libcrypto/des/ofb_enc.c +++ b/lib/libcrypto/des/ofb_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ofb_enc.c,v 1.8 2023/07/08 07:11:07 beck Exp $ */ +/* $OpenBSD: ofb_enc.c,v 1.9 2024/03/29 01:47:29 joshua Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -131,3 +131,4 @@ DES_ofb_encrypt(const unsigned char *in, unsigned char *out, int numbits, l2c(v1, iv); v0 = v1 = d0 = d1 = ti[0] = ti[1] = vv0 = vv1 = 0; } +LCRYPTO_ALIAS(DES_ofb_encrypt); diff --git a/lib/libcrypto/des/pcbc_enc.c b/lib/libcrypto/des/pcbc_enc.c index 3a420f01365..defd628d4df 100644 --- a/lib/libcrypto/des/pcbc_enc.c +++ b/lib/libcrypto/des/pcbc_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcbc_enc.c,v 1.9 2023/07/08 07:34:34 jsing Exp $ */ +/* $OpenBSD: pcbc_enc.c,v 1.10 2024/03/29 01:47:29 joshua Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -114,3 +114,4 @@ DES_pcbc_encrypt(const unsigned char *input, unsigned char *output, tin[0] = tin[1] = 0; sin0 = sin1 = xor0 = xor1 = tout0 = tout1 = 0; } +LCRYPTO_ALIAS(DES_pcbc_encrypt); diff --git a/lib/libcrypto/des/qud_cksm.c b/lib/libcrypto/des/qud_cksm.c index ab286682644..4ded2a05b02 100644 --- a/lib/libcrypto/des/qud_cksm.c +++ b/lib/libcrypto/des/qud_cksm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: qud_cksm.c,v 1.10 2023/07/08 07:34:34 jsing Exp $ */ +/* $OpenBSD: qud_cksm.c,v 1.11 2024/03/29 01:47:29 joshua Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -123,3 +123,4 @@ DES_quad_cksum(const unsigned char *input, DES_cblock output[], } return (z0); } +LCRYPTO_ALIAS(DES_quad_cksum); diff --git a/lib/libcrypto/des/set_key.c b/lib/libcrypto/des/set_key.c index 8ae40a81cd0..0e7aab688cc 100644 --- a/lib/libcrypto/des/set_key.c +++ b/lib/libcrypto/des/set_key.c @@ -1,4 +1,4 @@ -/* $OpenBSD: set_key.c,v 1.26 2023/12/20 06:30:04 tb Exp $ */ +/* $OpenBSD: set_key.c,v 1.27 2024/03/29 01:47:29 joshua Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -91,6 +91,7 @@ DES_set_odd_parity(DES_cblock *key) for (i = 0; i < DES_KEY_SZ; i++) (*key)[i] = odd_parity[(*key)[i]]; } +LCRYPTO_ALIAS(DES_set_odd_parity); int DES_check_key_parity(const_DES_cblock *key) @@ -103,6 +104,7 @@ DES_check_key_parity(const_DES_cblock *key) } return (1); } +LCRYPTO_ALIAS(DES_check_key_parity); /* Weak and semi weak keys as taken from * %A D.W. Davies @@ -145,6 +147,7 @@ DES_is_weak_key(const_DES_cblock *key) return 1; return 0; } +LCRYPTO_ALIAS(DES_is_weak_key); /* NOW DEFINED IN des_local.h * See ecb_encrypt.c for a pseudo description of these macros. @@ -314,6 +317,7 @@ DES_set_key(const_DES_cblock *key, DES_key_schedule *schedule) return 0; } } +LCRYPTO_ALIAS(DES_set_key); /* return 0 if key parity is odd (correct), * return -1 if key parity error, @@ -329,6 +333,7 @@ DES_set_key_checked(const_DES_cblock *key, DES_key_schedule *schedule) DES_set_key_unchecked(key, schedule); return 0; } +LCRYPTO_ALIAS(DES_set_key_checked); void DES_set_key_unchecked(const_DES_cblock *key, DES_key_schedule *schedule) @@ -388,12 +393,14 @@ DES_set_key_unchecked(const_DES_cblock *key, DES_key_schedule *schedule) *(k++) = ROTATE(t2, 26) & 0xffffffffL; } } +LCRYPTO_ALIAS(DES_set_key_unchecked); int DES_key_sched(const_DES_cblock *key, DES_key_schedule *schedule) { return (DES_set_key(key, schedule)); } +LCRYPTO_ALIAS(DES_key_sched); int DES_random_key(DES_cblock *ret) @@ -404,3 +411,4 @@ DES_random_key(DES_cblock *ret) } while (DES_is_weak_key(ret)); return (1); } +LCRYPTO_ALIAS(DES_random_key); diff --git a/lib/libcrypto/des/str2key.c b/lib/libcrypto/des/str2key.c index dd17a441b74..cc5bc91b4d8 100644 --- a/lib/libcrypto/des/str2key.c +++ b/lib/libcrypto/des/str2key.c @@ -1,4 +1,4 @@ -/* $OpenBSD: str2key.c,v 1.13 2023/07/08 07:34:34 jsing Exp $ */ +/* $OpenBSD: str2key.c,v 1.14 2024/03/29 01:47:29 joshua Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -97,6 +97,7 @@ DES_string_to_key(const char *str, DES_cblock *key) explicit_bzero(&ks, sizeof(ks)); DES_set_odd_parity(key); } +LCRYPTO_ALIAS(DES_string_to_key); void DES_string_to_2keys(const char *str, DES_cblock *key1, DES_cblock *key2) @@ -164,3 +165,4 @@ DES_string_to_2keys(const char *str, DES_cblock *key1, DES_cblock *key2) DES_set_odd_parity(key1); DES_set_odd_parity(key2); } +LCRYPTO_ALIAS(DES_string_to_2keys); diff --git a/lib/libcrypto/des/xcbc_enc.c b/lib/libcrypto/des/xcbc_enc.c index 87f348a9ab4..90607cad33d 100644 --- a/lib/libcrypto/des/xcbc_enc.c +++ b/lib/libcrypto/des/xcbc_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xcbc_enc.c,v 1.12 2023/07/08 07:34:34 jsing Exp $ */ +/* $OpenBSD: xcbc_enc.c,v 1.13 2024/03/29 01:47:29 joshua Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -151,3 +151,4 @@ DES_xcbc_encrypt(const unsigned char *in, unsigned char *out, inW0 = inW1 = outW0 = outW1 = 0; tin[0] = tin[1] = 0; } +LCRYPTO_ALIAS(DES_xcbc_encrypt); diff --git a/lib/libcrypto/hidden/openssl/des.h b/lib/libcrypto/hidden/openssl/des.h new file mode 100644 index 00000000000..9f6ea9c1042 --- /dev/null +++ b/lib/libcrypto/hidden/openssl/des.h @@ -0,0 +1,64 @@ +/* $OpenBSD: des.h,v 1.1 2024/03/29 01:47:29 joshua Exp $ */ +/* + * Copyright (c) 2024 Joshua Sing + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#ifndef _LIBCRYPTO_DES_H +#define _LIBCRYPTO_DES_H + +#ifndef _MSC_VER +#include_next +#else +#include "../include/openssl/des.h" +#endif +#include "crypto_namespace.h" + +LCRYPTO_USED(DES_ecb3_encrypt); +LCRYPTO_USED(DES_cbc_cksum); +LCRYPTO_USED(DES_cbc_encrypt); +LCRYPTO_USED(DES_ncbc_encrypt); +LCRYPTO_USED(DES_xcbc_encrypt); +LCRYPTO_USED(DES_cfb_encrypt); +LCRYPTO_USED(DES_ecb_encrypt); +LCRYPTO_USED(DES_encrypt1); +LCRYPTO_USED(DES_encrypt2); +LCRYPTO_USED(DES_encrypt3); +LCRYPTO_USED(DES_decrypt3); +LCRYPTO_USED(DES_ede3_cbc_encrypt); +LCRYPTO_USED(DES_ede3_cbcm_encrypt); +LCRYPTO_USED(DES_ede3_cfb64_encrypt); +LCRYPTO_USED(DES_ede3_cfb_encrypt); +LCRYPTO_USED(DES_ede3_ofb64_encrypt); +LCRYPTO_USED(DES_enc_read); +LCRYPTO_USED(DES_enc_write); +LCRYPTO_USED(DES_fcrypt); +LCRYPTO_USED(DES_crypt); +LCRYPTO_USED(DES_ofb_encrypt); +LCRYPTO_USED(DES_pcbc_encrypt); +LCRYPTO_USED(DES_quad_cksum); +LCRYPTO_USED(DES_random_key); +LCRYPTO_USED(DES_set_odd_parity); +LCRYPTO_USED(DES_check_key_parity); +LCRYPTO_USED(DES_is_weak_key); +LCRYPTO_USED(DES_set_key); +LCRYPTO_USED(DES_key_sched); +LCRYPTO_USED(DES_set_key_checked); +LCRYPTO_USED(DES_set_key_unchecked); +LCRYPTO_USED(DES_string_to_key); +LCRYPTO_USED(DES_string_to_2keys); +LCRYPTO_USED(DES_cfb64_encrypt); +LCRYPTO_USED(DES_ofb64_encrypt); + +#endif /* _LIBCRYPTO_DES_H */ -- 2.20.1