|
|
@ -11,7 +11,7 @@ |
|
|
|
* Should we include proxy digest auth functionality |
|
|
|
--- a/src/openvpn/crypto_mbedtls.c
|
|
|
|
+++ b/src/openvpn/crypto_mbedtls.c
|
|
|
|
@@ -383,6 +383,7 @@ int
|
|
|
|
@@ -396,6 +396,7 @@ int
|
|
|
|
key_des_num_cblocks(const mbedtls_cipher_info_t *kt) |
|
|
|
{ |
|
|
|
int ret = 0; |
|
|
@ -19,7 +19,7 @@ |
|
|
|
if (kt->type == MBEDTLS_CIPHER_DES_CBC) |
|
|
|
{ |
|
|
|
ret = 1; |
|
|
|
@@ -395,6 +396,7 @@ key_des_num_cblocks(const mbedtls_cipher
|
|
|
|
@@ -408,6 +409,7 @@ key_des_num_cblocks(const mbedtls_cipher
|
|
|
|
{ |
|
|
|
ret = 3; |
|
|
|
} |
|
|
@ -27,7 +27,7 @@ |
|
|
|
|
|
|
|
dmsg(D_CRYPTO_DEBUG, "CRYPTO INFO: n_DES_cblocks=%d", ret); |
|
|
|
return ret; |
|
|
|
@@ -403,6 +405,7 @@ key_des_num_cblocks(const mbedtls_cipher
|
|
|
|
@@ -416,6 +418,7 @@ key_des_num_cblocks(const mbedtls_cipher
|
|
|
|
bool |
|
|
|
key_des_check(uint8_t *key, int key_len, int ndc) |
|
|
|
{ |
|
|
@ -35,7 +35,7 @@ |
|
|
|
int i; |
|
|
|
struct buffer b; |
|
|
|
|
|
|
|
@@ -431,11 +434,15 @@ key_des_check(uint8_t *key, int key_len,
|
|
|
|
@@ -444,11 +447,15 @@ key_des_check(uint8_t *key, int key_len,
|
|
|
|
|
|
|
|
err: |
|
|
|
return false; |
|
|
@ -51,7 +51,7 @@ |
|
|
|
int i; |
|
|
|
struct buffer b; |
|
|
|
|
|
|
|
@@ -450,6 +457,7 @@ key_des_fixup(uint8_t *key, int key_len,
|
|
|
|
@@ -463,6 +470,7 @@ key_des_fixup(uint8_t *key, int key_len,
|
|
|
|
} |
|
|
|
mbedtls_des_key_set_parity(key); |
|
|
|
} |
|
|
@ -59,7 +59,7 @@ |
|
|
|
} |
|
|
|
|
|
|
|
/* |
|
|
|
@@ -770,10 +778,12 @@ cipher_des_encrypt_ecb(const unsigned ch
|
|
|
|
@@ -783,10 +791,12 @@ cipher_des_encrypt_ecb(const unsigned ch
|
|
|
|
unsigned char *src, |
|
|
|
unsigned char *dst) |
|
|
|
{ |
|
|
|