diff options
| author | Theo Buehler <tb@openbsd.org> | 2025-06-17 04:41:05 +0200 |
|---|---|---|
| committer | Theo Buehler <tb@openbsd.org> | 2025-06-17 08:54:51 +0200 |
| commit | 41ddb5ccbf5ace59f71d8f973a44b5241558c785 (patch) | |
| tree | 7214c8d3bd0004dd84d0c592dd895b085a199c52 | |
| parent | a64e99ae2562f8294e0910ce2b72aa17249bd1aa (diff) | |
| download | portable-41ddb5ccbf5ace59f71d8f973a44b5241558c785.tar.gz portable-41ddb5ccbf5ace59f71d8f973a44b5241558c785.tar.bz2 portable-41ddb5ccbf5ace59f71d8f973a44b5241558c785.zip | |
Revert "Sprinkle some #ifdef"
This reverts commit a64e99ae2562f8294e0910ce2b72aa17249bd1aa.
| -rw-r--r-- | patches/aes_amd64.c.patch | 55 | ||||
| -rw-r--r-- | patches/aes_i386.c.patch | 55 |
2 files changed, 0 insertions, 110 deletions
diff --git a/patches/aes_amd64.c.patch b/patches/aes_amd64.c.patch deleted file mode 100644 index 205b71c..0000000 --- a/patches/aes_amd64.c.patch +++ /dev/null | |||
| @@ -1,55 +0,0 @@ | |||
| 1 | --- crypto/aes/aes_amd64.c.orig Mon Jun 16 11:48:01 2025 | ||
| 2 | +++ crypto/aes/aes_amd64.c Mon Jun 16 11:51:51 2025 | ||
| 3 | @@ -45,6 +45,7 @@ void aesni_decrypt(const unsigned char *in, unsigned c | ||
| 4 | void aesni_cbc_encrypt(const unsigned char *in, unsigned char *out, | ||
| 5 | size_t len, const AES_KEY *key, unsigned char *ivec, const int enc); | ||
| 6 | |||
| 7 | +#ifdef HAVE_AES_SET_ENCRYPT_KEY_INTERNAL | ||
| 8 | int | ||
| 9 | aes_set_encrypt_key_internal(const unsigned char *userKey, const int bits, | ||
| 10 | AES_KEY *key) | ||
| 11 | @@ -54,7 +55,9 @@ aes_set_encrypt_key_internal(const unsigned char *user | ||
| 12 | |||
| 13 | return aes_set_encrypt_key_generic(userKey, bits, key); | ||
| 14 | } | ||
| 15 | +#endif | ||
| 16 | |||
| 17 | +#ifdef HAVE_AES_SET_DECRYPT_KEY_INTERNAL | ||
| 18 | int | ||
| 19 | aes_set_decrypt_key_internal(const unsigned char *userKey, const int bits, | ||
| 20 | AES_KEY *key) | ||
| 21 | @@ -64,7 +67,9 @@ aes_set_decrypt_key_internal(const unsigned char *user | ||
| 22 | |||
| 23 | return aes_set_decrypt_key_generic(userKey, bits, key); | ||
| 24 | } | ||
| 25 | +#endif | ||
| 26 | |||
| 27 | +#ifdef HAVE_AES_ENCRYPT_INTERNAL | ||
| 28 | void | ||
| 29 | aes_encrypt_internal(const unsigned char *in, unsigned char *out, | ||
| 30 | const AES_KEY *key) | ||
| 31 | @@ -76,7 +81,9 @@ aes_encrypt_internal(const unsigned char *in, unsigned | ||
| 32 | |||
| 33 | aes_encrypt_generic(in, out, key); | ||
| 34 | } | ||
| 35 | +#endif | ||
| 36 | |||
| 37 | +#ifdef HAVE_AES_DECRYPT_INTERNAL | ||
| 38 | void | ||
| 39 | aes_decrypt_internal(const unsigned char *in, unsigned char *out, | ||
| 40 | const AES_KEY *key) | ||
| 41 | @@ -88,7 +95,9 @@ aes_decrypt_internal(const unsigned char *in, unsigned | ||
| 42 | |||
| 43 | aes_decrypt_generic(in, out, key); | ||
| 44 | } | ||
| 45 | +#endif | ||
| 46 | |||
| 47 | +#ifdef HAVE_AES_CBC_ENCRYPT_INTERNAL | ||
| 48 | void | ||
| 49 | aes_cbc_encrypt_internal(const unsigned char *in, unsigned char *out, | ||
| 50 | size_t len, const AES_KEY *key, unsigned char *ivec, const int enc) | ||
| 51 | @@ -100,3 +109,4 @@ aes_cbc_encrypt_internal(const unsigned char *in, unsi | ||
| 52 | |||
| 53 | aes_cbc_encrypt_generic(in, out, len, key, ivec, enc); | ||
| 54 | } | ||
| 55 | +#endif | ||
diff --git a/patches/aes_i386.c.patch b/patches/aes_i386.c.patch deleted file mode 100644 index a195313..0000000 --- a/patches/aes_i386.c.patch +++ /dev/null | |||
| @@ -1,55 +0,0 @@ | |||
| 1 | --- crypto/aes/aes_i386.c.orig Mon Jun 16 11:54:30 2025 | ||
| 2 | +++ crypto/aes/aes_i386.c Mon Jun 16 11:53:31 2025 | ||
| 3 | @@ -45,6 +45,7 @@ void aesni_decrypt(const unsigned char *in, unsigned c | ||
| 4 | void aesni_cbc_encrypt(const unsigned char *in, unsigned char *out, | ||
| 5 | size_t len, const AES_KEY *key, unsigned char *ivec, const int enc); | ||
| 6 | |||
| 7 | +#ifdef HAVE_AES_SET_ENCRYPT_KEY_INTERNAL | ||
| 8 | int | ||
| 9 | aes_set_encrypt_key_internal(const unsigned char *userKey, const int bits, | ||
| 10 | AES_KEY *key) | ||
| 11 | @@ -54,7 +55,9 @@ aes_set_encrypt_key_internal(const unsigned char *user | ||
| 12 | |||
| 13 | return aes_set_encrypt_key_generic(userKey, bits, key); | ||
| 14 | } | ||
| 15 | +#endif | ||
| 16 | |||
| 17 | +#ifdef HAVE_SET_DECRYPT_KEY_INTERNAL | ||
| 18 | int | ||
| 19 | aes_set_decrypt_key_internal(const unsigned char *userKey, const int bits, | ||
| 20 | AES_KEY *key) | ||
| 21 | @@ -64,7 +67,9 @@ aes_set_decrypt_key_internal(const unsigned char *user | ||
| 22 | |||
| 23 | return aes_set_decrypt_key_generic(userKey, bits, key); | ||
| 24 | } | ||
| 25 | +#endif | ||
| 26 | |||
| 27 | +#ifdef HAVE_AES_ENCRYPT_INTERNAL | ||
| 28 | void | ||
| 29 | aes_encrypt_internal(const unsigned char *in, unsigned char *out, | ||
| 30 | const AES_KEY *key) | ||
| 31 | @@ -76,7 +81,9 @@ aes_encrypt_internal(const unsigned char *in, unsigned | ||
| 32 | |||
| 33 | aes_encrypt_generic(in, out, key); | ||
| 34 | } | ||
| 35 | +#endif | ||
| 36 | |||
| 37 | +#ifdef HAVE_AES_DECRYPT_INTERNAL | ||
| 38 | void | ||
| 39 | aes_decrypt_internal(const unsigned char *in, unsigned char *out, | ||
| 40 | const AES_KEY *key) | ||
| 41 | @@ -88,7 +95,9 @@ aes_decrypt_internal(const unsigned char *in, unsigned | ||
| 42 | |||
| 43 | aes_decrypt_generic(in, out, key); | ||
| 44 | } | ||
| 45 | +#endif | ||
| 46 | |||
| 47 | +#ifdef HAVE_AES_CBC_ENCRYPT_INTERNAL | ||
| 48 | void | ||
| 49 | aes_cbc_encrypt_internal(const unsigned char *in, unsigned char *out, | ||
| 50 | size_t len, const AES_KEY *key, unsigned char *ivec, const int enc) | ||
| 51 | @@ -100,3 +109,4 @@ aes_cbc_encrypt_internal(const unsigned char *in, unsi | ||
| 52 | |||
| 53 | aes_cbc_encrypt_generic(in, out, len, key, ivec, enc); | ||
| 54 | } | ||
| 55 | +#endif | ||
