aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
Diffstat (limited to 'security')
-rw-r--r--security/openvpn20/Makefile2
-rw-r--r--security/openvpn20/files/patch-CVE-2013-206174
-rw-r--r--security/openvpn22/Makefile5
-rw-r--r--security/openvpn22/files/patch-CVE-2013-206174
-rw-r--r--security/vuxml/vuln.xml6
5 files changed, 158 insertions, 3 deletions
diff --git a/security/openvpn20/Makefile b/security/openvpn20/Makefile
index 6d3b0cdcb587..4ee0e963858a 100644
--- a/security/openvpn20/Makefile
+++ b/security/openvpn20/Makefile
@@ -3,7 +3,7 @@
PORTNAME= openvpn
PORTVERSION= 2.0.9
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= security net
# MASTER_SITES points to hosts in distinct data centers,
# so just one MASTER_SITES entry should be OK.
diff --git a/security/openvpn20/files/patch-CVE-2013-2061 b/security/openvpn20/files/patch-CVE-2013-2061
new file mode 100644
index 000000000000..fc622b37a131
--- /dev/null
+++ b/security/openvpn20/files/patch-CVE-2013-2061
@@ -0,0 +1,74 @@
+commit 11d21349a4e7e38a025849479b36ace7c2eec2ee
+Author: Steffan Karger <steffan.karger@fox-it.com>
+Date: Tue Mar 19 13:01:50 2013 +0100
+
+ Use constant time memcmp when comparing HMACs in openvpn_decrypt.
+
+ Signed-off-by: Steffan Karger <steffan.karger@fox-it.com>
+ Acked-by: Gert Doering <gert@greenie.muc.de>
+ Signed-off-by: Gert Doering <gert@greenie.muc.de>
+
+diff --git a/src/openvpn/buffer.h b/src/openvpn/buffer.h
+index 7cae733..93efb09 100644
+--- ./buffer.h~
++++ ./buffer.h
+@@ -668,6 +668,10 @@ buf_read_u32 (struct buffer *buf, bool *good)
+ }
+ }
+
++/**
++ * Compare src buffer contents with match.
++ * *NOT* constant time. Do not use when comparing HMACs.
++ */
+ static inline bool
+ buf_string_match (const struct buffer *src, const void *match, int size)
+ {
+@@ -676,6 +680,10 @@ buf_string_match (const struct buffer *src, const void *match, int size)
+ return memcmp (BPTR (src), match, size) == 0;
+ }
+
++/**
++ * Compare first size bytes of src buffer contents with match.
++ * *NOT* constant time. Do not use when comparing HMACs.
++ */
+ static inline bool
+ buf_string_match_head (const struct buffer *src, const void *match, int size)
+ {
+diff --git a/src/openvpn/crypto.c b/src/openvpn/crypto.c
+index 405c0aa..d9adf5b 100644
+--- ./crypto.c~
++++ ./crypto.c
+@@ -65,6 +65,24 @@
+ #define CRYPT_ERROR(format) \
+ do { msg (D_CRYPT_ERRORS, "%s: " format, error_prefix); goto error_exit; } while (false)
+
++/**
++ * As memcmp(), but constant-time.
++ * Returns 0 when data is equal, non-zero otherwise.
++ */
++static int
++memcmp_constant_time (const void *a, const void *b, size_t size) {
++ const uint8_t * a1 = a;
++ const uint8_t * b1 = b;
++ int ret = 0;
++ size_t i;
++
++ for (i = 0; i < size; i++) {
++ ret |= *a1++ ^ *b1++;
++ }
++
++ return ret;
++}
++
+ void
+ openvpn_encrypt (struct buffer *buf, struct buffer work,
+ const struct crypto_options *opt,
+@@ -244,7 +262,7 @@ openvpn_decrypt (struct buffer *buf, struct buffer work,
+ hmac_ctx_final (ctx->hmac, local_hmac);
+
+ /* Compare locally computed HMAC with packet HMAC */
+- if (memcmp (local_hmac, BPTR (buf), hmac_len))
++ if (memcmp_constant_time (local_hmac, BPTR (buf), hmac_len))
+ CRYPT_ERROR ("packet HMAC authentication failed");
+
+ ASSERT (buf_advance (buf, hmac_len));
diff --git a/security/openvpn22/Makefile b/security/openvpn22/Makefile
index 291440df6901..1251e916db0a 100644
--- a/security/openvpn22/Makefile
+++ b/security/openvpn22/Makefile
@@ -3,7 +3,7 @@
PORTNAME= openvpn
DISTVERSION= 2.2.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security net
# MASTER_SITES points to hosts in distinct data centers,
# so just one MASTER_SITES entry should be OK.
@@ -18,6 +18,9 @@ LICENSE= GPLv2
LATEST_LINK= openvpn22
CONFLICTS_INSTALL= openvpn-devel-[0-9]* openvpn-2.[!2]* openvpn-beta-[0-9]*
+DEPRECATED= Please migrate to a newer OpenVPN version
+EXPIRATION_DATE= 2013-09-01
+
GNU_CONFIGURE= yes
USE_OPENSSL= yes
USE_XZ= yes
diff --git a/security/openvpn22/files/patch-CVE-2013-2061 b/security/openvpn22/files/patch-CVE-2013-2061
new file mode 100644
index 000000000000..fc622b37a131
--- /dev/null
+++ b/security/openvpn22/files/patch-CVE-2013-2061
@@ -0,0 +1,74 @@
+commit 11d21349a4e7e38a025849479b36ace7c2eec2ee
+Author: Steffan Karger <steffan.karger@fox-it.com>
+Date: Tue Mar 19 13:01:50 2013 +0100
+
+ Use constant time memcmp when comparing HMACs in openvpn_decrypt.
+
+ Signed-off-by: Steffan Karger <steffan.karger@fox-it.com>
+ Acked-by: Gert Doering <gert@greenie.muc.de>
+ Signed-off-by: Gert Doering <gert@greenie.muc.de>
+
+diff --git a/src/openvpn/buffer.h b/src/openvpn/buffer.h
+index 7cae733..93efb09 100644
+--- ./buffer.h~
++++ ./buffer.h
+@@ -668,6 +668,10 @@ buf_read_u32 (struct buffer *buf, bool *good)
+ }
+ }
+
++/**
++ * Compare src buffer contents with match.
++ * *NOT* constant time. Do not use when comparing HMACs.
++ */
+ static inline bool
+ buf_string_match (const struct buffer *src, const void *match, int size)
+ {
+@@ -676,6 +680,10 @@ buf_string_match (const struct buffer *src, const void *match, int size)
+ return memcmp (BPTR (src), match, size) == 0;
+ }
+
++/**
++ * Compare first size bytes of src buffer contents with match.
++ * *NOT* constant time. Do not use when comparing HMACs.
++ */
+ static inline bool
+ buf_string_match_head (const struct buffer *src, const void *match, int size)
+ {
+diff --git a/src/openvpn/crypto.c b/src/openvpn/crypto.c
+index 405c0aa..d9adf5b 100644
+--- ./crypto.c~
++++ ./crypto.c
+@@ -65,6 +65,24 @@
+ #define CRYPT_ERROR(format) \
+ do { msg (D_CRYPT_ERRORS, "%s: " format, error_prefix); goto error_exit; } while (false)
+
++/**
++ * As memcmp(), but constant-time.
++ * Returns 0 when data is equal, non-zero otherwise.
++ */
++static int
++memcmp_constant_time (const void *a, const void *b, size_t size) {
++ const uint8_t * a1 = a;
++ const uint8_t * b1 = b;
++ int ret = 0;
++ size_t i;
++
++ for (i = 0; i < size; i++) {
++ ret |= *a1++ ^ *b1++;
++ }
++
++ return ret;
++}
++
+ void
+ openvpn_encrypt (struct buffer *buf, struct buffer work,
+ const struct crypto_options *opt,
+@@ -244,7 +262,7 @@ openvpn_decrypt (struct buffer *buf, struct buffer work,
+ hmac_ctx_final (ctx->hmac, local_hmac);
+
+ /* Compare locally computed HMAC with packet HMAC */
+- if (memcmp (local_hmac, BPTR (buf), hmac_len))
++ if (memcmp_constant_time (local_hmac, BPTR (buf), hmac_len))
+ CRYPT_ERROR ("packet HMAC authentication failed");
+
+ ASSERT (buf_advance (buf, hmac_len));
diff --git a/security/vuxml/vuln.xml b/security/vuxml/vuln.xml
index b18867c28f44..e5c4f844ad3b 100644
--- a/security/vuxml/vuln.xml
+++ b/security/vuxml/vuln.xml
@@ -1662,7 +1662,9 @@ Note: Please add new entries to the beginning of this file.
<affects>
<package>
<name>openvpn</name>
- <range><lt>2.3.1</lt></range>
+ <range><lt>2.0.9_4</lt></range>
+ <range><ge>2.1.0</ge><lt>2.2.2_2</lt></range>
+ <range><ge>2.3.0</ge><lt>2.3.1</lt></range>
</package>
</affects>
<description>
@@ -1677,10 +1679,12 @@ Note: Please add new entries to the beginning of this file.
</description>
<references>
<url>https://community.openvpn.net/openvpn/wiki/SecurityAnnouncement-f375aa67cc</url>
+ <cvename>CVE-2013-2061</cvename>
</references>
<dates>
<discovery>2013-03-19</discovery>
<entry>2013-03-31</entry>
+ <modified>2013-06-01</modified>
</dates>
</vuln>
generated by cgit (git 2.34.1) at 2025-01-03 23:07:25 +0800