Re: [PATCH] adding RSA-MD4 for HMAC encryption in nm-openvpn

2011-06-02 Thread Dan Williams
On Fri, 2011-05-20 at 12:22 +0200, Olivier Lambert wrote:
 Hi everyone,
 
 (sorry, repost, but I forgot previously the syntax [PATCH] in subject)

Thanks, applied to 0.8 and git master.

Dan

 I need to connect to a corporate OpenVPN server. This VPN use RSA-MD4
 on HMAC.. But this option doesn't exist in the nm GUI !
 
 So, here is a fix (it was tested by me, and it works like a charm).
 
 diff --git a/properties/auth-helpers.c b/properties/auth-helpers.c
 index 357a5dd..322688e 100644
 --- a/properties/auth-helpers.c
 +++ b/properties/auth-helpers.c
 @@ -1077,6 +1077,7 @@ populate_hmacauth_combo (GtkComboBox *box, const char 
 *hm
const char **item;
static const char *items[] = {
NM_OPENVPN_AUTH_NONE,
 +   NM_OPENVPN_AUTH_MD4,
NM_OPENVPN_AUTH_MD5,
NM_OPENVPN_AUTH_SHA1,
NM_OPENVPN_AUTH_SHA224,
 @@ -1102,6 +1103,8 @@ populate_hmacauth_combo (GtkComboBox *box, const char 
 *hm
 
if (!strcmp (*item, NM_OPENVPN_AUTH_NONE))
name = _(None);
 +   else if (!strcmp (*item, NM_OPENVPN_AUTH_MD4))
 +   name = _(RSA-MD4);
else if (!strcmp (*item, NM_OPENVPN_AUTH_MD5))
name = _(MD-5);
else if (!strcmp (*item, NM_OPENVPN_AUTH_SHA1))
 diff --git a/src/nm-openvpn-service.c b/src/nm-openvpn-service.c
 index f3c25ce..0762e89 100644
 --- a/src/nm-openvpn-service.c
 +++ b/src/nm-openvpn-service.c
 @@ -605,6 +605,7 @@ validate_auth (const char *auth)
  {
if (auth) {
if (   !strcmp (auth, NM_OPENVPN_AUTH_NONE)
 +   || !strcmp (auth, NM_OPENVPN_AUTH_MD4)
|| !strcmp (auth, NM_OPENVPN_AUTH_MD5)
|| !strcmp (auth, NM_OPENVPN_AUTH_SHA1)
|| !strcmp (auth, NM_OPENVPN_AUTH_SHA224)
 diff --git a/src/nm-openvpn-service.h b/src/nm-openvpn-service.h
 index d503f4e..bc245b0 100644
 --- a/src/nm-openvpn-service.h
 +++ b/src/nm-openvpn-service.h
 @@ -77,6 +77,7 @@
  #define NM_OPENVPN_KEY_RENEG_SECONDS reneg-seconds
 
  #define NM_OPENVPN_AUTH_NONE none
 +#define NM_OPENVPN_AUTH_MD4  RSA-MD4
  #define NM_OPENVPN_AUTH_MD5  MD5
  #define NM_OPENVPN_AUTH_SHA1 SHA1
  #define NM_OPENVPN_AUTH_SHA224 SHA224
 ___
 networkmanager-list mailing list
 networkmanager-list@gnome.org
 http://mail.gnome.org/mailman/listinfo/networkmanager-list


___
networkmanager-list mailing list
networkmanager-list@gnome.org
http://mail.gnome.org/mailman/listinfo/networkmanager-list


[PATCH] adding RSA-MD4 for HMAC encryption in nm-openvpn

2011-05-20 Thread Olivier Lambert
Hi everyone,

(sorry, repost, but I forgot previously the syntax [PATCH] in subject)

I need to connect to a corporate OpenVPN server. This VPN use RSA-MD4
on HMAC.. But this option doesn't exist in the nm GUI !

So, here is a fix (it was tested by me, and it works like a charm).

diff --git a/properties/auth-helpers.c b/properties/auth-helpers.c
index 357a5dd..322688e 100644
--- a/properties/auth-helpers.c
+++ b/properties/auth-helpers.c
@@ -1077,6 +1077,7 @@ populate_hmacauth_combo (GtkComboBox *box, const char *hm
   const char **item;
   static const char *items[] = {
   NM_OPENVPN_AUTH_NONE,
+   NM_OPENVPN_AUTH_MD4,
   NM_OPENVPN_AUTH_MD5,
   NM_OPENVPN_AUTH_SHA1,
   NM_OPENVPN_AUTH_SHA224,
@@ -1102,6 +1103,8 @@ populate_hmacauth_combo (GtkComboBox *box, const char *hm

   if (!strcmp (*item, NM_OPENVPN_AUTH_NONE))
   name = _(None);
+   else if (!strcmp (*item, NM_OPENVPN_AUTH_MD4))
+   name = _(RSA-MD4);
   else if (!strcmp (*item, NM_OPENVPN_AUTH_MD5))
   name = _(MD-5);
   else if (!strcmp (*item, NM_OPENVPN_AUTH_SHA1))
diff --git a/src/nm-openvpn-service.c b/src/nm-openvpn-service.c
index f3c25ce..0762e89 100644
--- a/src/nm-openvpn-service.c
+++ b/src/nm-openvpn-service.c
@@ -605,6 +605,7 @@ validate_auth (const char *auth)
 {
   if (auth) {
   if (   !strcmp (auth, NM_OPENVPN_AUTH_NONE)
+   || !strcmp (auth, NM_OPENVPN_AUTH_MD4)
   || !strcmp (auth, NM_OPENVPN_AUTH_MD5)
   || !strcmp (auth, NM_OPENVPN_AUTH_SHA1)
   || !strcmp (auth, NM_OPENVPN_AUTH_SHA224)
diff --git a/src/nm-openvpn-service.h b/src/nm-openvpn-service.h
index d503f4e..bc245b0 100644
--- a/src/nm-openvpn-service.h
+++ b/src/nm-openvpn-service.h
@@ -77,6 +77,7 @@
 #define NM_OPENVPN_KEY_RENEG_SECONDS reneg-seconds

 #define NM_OPENVPN_AUTH_NONE none
+#define NM_OPENVPN_AUTH_MD4  RSA-MD4
 #define NM_OPENVPN_AUTH_MD5  MD5
 #define NM_OPENVPN_AUTH_SHA1 SHA1
 #define NM_OPENVPN_AUTH_SHA224 SHA224
___
networkmanager-list mailing list
networkmanager-list@gnome.org
http://mail.gnome.org/mailman/listinfo/networkmanager-list