b.liu | e958203 | 2025-04-17 19:18:16 +0800 | [diff] [blame^] | 1 | --- a/src/openvpn/syshead.h |
| 2 | +++ b/src/openvpn/syshead.h |
| 3 | @@ -572,7 +572,7 @@ socket_defined(const socket_descriptor_t |
| 4 | /* |
| 5 | * Should we include NTLM proxy functionality |
| 6 | */ |
| 7 | -#define NTLM 1 |
| 8 | +//#define NTLM 1 |
| 9 | |
| 10 | /* |
| 11 | * Should we include proxy digest auth functionality |
| 12 | --- a/src/openvpn/crypto_mbedtls.c |
| 13 | +++ b/src/openvpn/crypto_mbedtls.c |
| 14 | @@ -383,6 +383,7 @@ int |
| 15 | key_des_num_cblocks(const mbedtls_cipher_info_t *kt) |
| 16 | { |
| 17 | int ret = 0; |
| 18 | +#ifdef MBEDTLS_DES_C |
| 19 | if (kt->type == MBEDTLS_CIPHER_DES_CBC) |
| 20 | { |
| 21 | ret = 1; |
| 22 | @@ -395,6 +396,7 @@ key_des_num_cblocks(const mbedtls_cipher |
| 23 | { |
| 24 | ret = 3; |
| 25 | } |
| 26 | +#endif |
| 27 | |
| 28 | dmsg(D_CRYPTO_DEBUG, "CRYPTO INFO: n_DES_cblocks=%d", ret); |
| 29 | return ret; |
| 30 | @@ -403,6 +405,7 @@ key_des_num_cblocks(const mbedtls_cipher |
| 31 | bool |
| 32 | key_des_check(uint8_t *key, int key_len, int ndc) |
| 33 | { |
| 34 | +#ifdef MBEDTLS_DES_C |
| 35 | int i; |
| 36 | struct buffer b; |
| 37 | |
| 38 | @@ -431,11 +434,15 @@ key_des_check(uint8_t *key, int key_len, |
| 39 | |
| 40 | err: |
| 41 | return false; |
| 42 | +#else |
| 43 | + return true; |
| 44 | +#endif |
| 45 | } |
| 46 | |
| 47 | void |
| 48 | key_des_fixup(uint8_t *key, int key_len, int ndc) |
| 49 | { |
| 50 | +#ifdef MBEDTLS_DES_C |
| 51 | int i; |
| 52 | struct buffer b; |
| 53 | |
| 54 | @@ -450,6 +457,7 @@ key_des_fixup(uint8_t *key, int key_len, |
| 55 | } |
| 56 | mbedtls_des_key_set_parity(key); |
| 57 | } |
| 58 | +#endif |
| 59 | } |
| 60 | |
| 61 | /* |
| 62 | @@ -770,10 +778,12 @@ cipher_des_encrypt_ecb(const unsigned ch |
| 63 | unsigned char *src, |
| 64 | unsigned char *dst) |
| 65 | { |
| 66 | +#ifdef MBEDTLS_DES_C |
| 67 | mbedtls_des_context ctx; |
| 68 | |
| 69 | ASSERT(mbed_ok(mbedtls_des_setkey_enc(&ctx, key))); |
| 70 | ASSERT(mbed_ok(mbedtls_des_crypt_ecb(&ctx, src, dst))); |
| 71 | +#endif |
| 72 | } |
| 73 | |
| 74 | |