bin/105614: [patch] setkey(8): Creating NULL encryption ESP SAs with setkey fails

[John W. O'Brien]

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

On 01/30/2013 11:31 PM, Eitan Adler wrote:
> The patch is maleformed in the PR.  Perhaps you could attach and
> resend?

Gladly.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with undefined - http://www.enigmail.net/

iQEcBAEBAgAGBQJRCmbyAAoJEEdKvTwaez9woYkH/0Wm/KjM+6ggRfDs6hcHDE0X
J1KCr3+Y2NAkCXk76uQB2S0K4g1NMF6oIP3JWAMaRKww9m9kaWTHz9wZAqeaVa8c
DriGjePFLUs+ukjRWuYKwYbTHzF/21DTxzOvkqAXOnprZiwY4T4a+WtF0SPAL5lO
FyZTtH0XV+jW3o5sZ5XFQeNhAwbREvvv9VUp6mw6IoUi0dDcfeF3GVE/a63d2YDy
A4UKqsQOIC/hzQqtQBrSOfXTPylb0C4mjflzX50lMLfNI3Xi7NA/NnyGG2p1FSW1
XHngu2TSULx6OQOenX/xUh2Kag1yBxOv32UKNuR2/zX4CO5q8+CVZx7tQS9lkY0=
=irDK
-----END PGP SIGNATURE-----
-------------- next part --------------
Index: parse.y
===================================================================
--- parse.y	(revision 245947)
+++ parse.y	(working copy)
@@ -1010,7 +1010,8 @@
 	l = sizeof(struct sadb_msg);
 
 	/* set encryption algorithm, if present. */
-	if (satype != SADB_X_SATYPE_IPCOMP && p_key_enc) {
+	if (satype != SADB_X_SATYPE_IPCOMP &&
+	    (p_key_enc || satype == SADB_SATYPE_ESP)) {
 		struct sadb_key m_key;
 
 		m_key.sadb_key_len =