Re: Release: 0.7.1

[Cyril Jaquier <cyril jaquier jaqpot net>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi David,

> I may have lied about not being able to create keys which work with the
> existing code -- can you try reverting my patch and setting a key named
> 'Perfect 32Forward@32Secrecy' instead?
> 
> If that works, then all we actually need to do is add the 'Vendor'
> option.
> 

Indeed, only the "Vendor" part of your patch is needed. By the way, it
is not 'Perfect 32Forward@32Secrecy' but 'Perfect 32@Forward 32@Secrecy'.

Dan, I think the following patch is reasonably small to be included in
0.7.1 ;) This will allow Netscreen/Juniper users to connect without too
many troubles.

Thank you again David :)

Regards,

Cyril

diff -Naur src-orig/nm-vpnc-service.c src/nm-vpnc-service.c
- --- src-orig/nm-vpnc-service.c	2009-04-26 16:50:37.431425871 +0200
+++ src/nm-vpnc-service.c	2009-04-26 16:52:13.059411705 +0200
@@ -68,6 +68,7 @@
 	{ NM_VPNC_KEY_DOMAIN,                G_TYPE_STRING, 0, 0 },
 	{ NM_VPNC_KEY_DHGROUP,               G_TYPE_STRING, 0, 0 },
 	{ NM_VPNC_KEY_PERFECT_FORWARD,       G_TYPE_STRING, 0, 0 },
+	{ NM_VPNC_KEY_VENDOR,                G_TYPE_STRING, 0, 0 },
 	{ NM_VPNC_KEY_APP_VERSION,           G_TYPE_STRING, 0, 0 },
 	{ NM_VPNC_KEY_SINGLE_DES,            G_TYPE_BOOLEAN, 0, 0 },
 	{ NM_VPNC_KEY_NO_ENCRYPTION,         G_TYPE_BOOLEAN, 0, 0 },
diff -Naur src-orig/nm-vpnc-service.h src/nm-vpnc-service.h
- --- src-orig/nm-vpnc-service.h	2009-04-26 16:50:37.420970188 +0200
+++ src/nm-vpnc-service.h	2009-04-26 16:51:19.559776681 +0200
@@ -47,6 +47,7 @@
 #define NM_VPNC_KEY_DOMAIN "Domain"
 #define NM_VPNC_KEY_DHGROUP "IKE DH Group"
 #define NM_VPNC_KEY_PERFECT_FORWARD "Perfect Forward Secrecy"
+#define NM_VPNC_KEY_VENDOR "Vendor"
 #define NM_VPNC_KEY_APP_VERSION "Application Version"
 #define NM_VPNC_KEY_SINGLE_DES "Enable Single DES"
 #define NM_VPNC_KEY_NO_ENCRYPTION "Enable no encryption"
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkn0d+IACgkQlYy8cEwUMaTY9wCeLl9a86xQnBwtgRwiknylsrlX
RWEAmgMxQbtGwjF0zFgzgUw4BZUGSZ1F
=K/zh
-----END PGP SIGNATURE-----