|
@@ -1,6 +1,6 @@
|
|
|
--- a/src/openvpn/syshead.h
|
|
|
+++ b/src/openvpn/syshead.h
|
|
|
-@@ -594,11 +594,11 @@ socket_defined(const socket_descriptor_t
|
|
|
+@@ -597,11 +597,11 @@ socket_defined(const socket_descriptor_t
|
|
|
/*
|
|
|
* Should we include NTLM proxy functionality
|
|
|
*/
|
|
@@ -18,7 +18,7 @@
|
|
|
* Should we include proxy digest auth functionality
|
|
|
--- a/src/openvpn/crypto_mbedtls.c
|
|
|
+++ b/src/openvpn/crypto_mbedtls.c
|
|
|
-@@ -320,6 +320,7 @@ int
|
|
|
+@@ -319,6 +319,7 @@ int
|
|
|
key_des_num_cblocks(const mbedtls_cipher_info_t *kt)
|
|
|
{
|
|
|
int ret = 0;
|
|
@@ -26,7 +26,7 @@
|
|
|
if (kt->type == MBEDTLS_CIPHER_DES_CBC)
|
|
|
{
|
|
|
ret = 1;
|
|
|
-@@ -332,6 +333,7 @@ key_des_num_cblocks(const mbedtls_cipher
|
|
|
+@@ -331,6 +332,7 @@ key_des_num_cblocks(const mbedtls_cipher
|
|
|
{
|
|
|
ret = 3;
|
|
|
}
|
|
@@ -34,7 +34,7 @@
|
|
|
|
|
|
dmsg(D_CRYPTO_DEBUG, "CRYPTO INFO: n_DES_cblocks=%d", ret);
|
|
|
return ret;
|
|
|
-@@ -340,6 +342,7 @@ key_des_num_cblocks(const mbedtls_cipher
|
|
|
+@@ -339,6 +341,7 @@ key_des_num_cblocks(const mbedtls_cipher
|
|
|
bool
|
|
|
key_des_check(uint8_t *key, int key_len, int ndc)
|
|
|
{
|
|
@@ -42,7 +42,7 @@
|
|
|
int i;
|
|
|
struct buffer b;
|
|
|
|
|
|
-@@ -368,11 +371,15 @@ key_des_check(uint8_t *key, int key_len,
|
|
|
+@@ -367,11 +370,15 @@ key_des_check(uint8_t *key, int key_len,
|
|
|
|
|
|
err:
|
|
|
return false;
|
|
@@ -58,7 +58,7 @@
|
|
|
int i;
|
|
|
struct buffer b;
|
|
|
|
|
|
-@@ -387,6 +394,7 @@ key_des_fixup(uint8_t *key, int key_len,
|
|
|
+@@ -386,6 +393,7 @@ key_des_fixup(uint8_t *key, int key_len,
|
|
|
}
|
|
|
mbedtls_des_key_set_parity(key);
|
|
|
}
|
|
@@ -66,7 +66,7 @@
|
|
|
}
|
|
|
|
|
|
/*
|
|
|
-@@ -698,10 +706,12 @@ cipher_des_encrypt_ecb(const unsigned ch
|
|
|
+@@ -710,10 +718,12 @@ cipher_des_encrypt_ecb(const unsigned ch
|
|
|
unsigned char *src,
|
|
|
unsigned char *dst)
|
|
|
{
|