From: Tobias Brunner <tobias@strongswan.org>
Date: Sat, 12 Jan 2013 10:58:26 +0000 (+0100)
Subject: Merge branch 'ikev1-fragmentation'
X-Git-Tag: 5.0.2dr4~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21235e1ec247b1d1bd58096f72d4f0dc21cec66f;p=thirdparty%2Fstrongswan.git

Merge branch 'ikev1-fragmentation'

This adds support for the proprietary IKEv1 fragmentation extension.

Conflicts:
	NEWS
---

21235e1ec247b1d1bd58096f72d4f0dc21cec66f
diff --cc NEWS
index 5655a3b38f,272020d8fa..d644904b5e
--- a/NEWS
+++ b/NEWS
@@@ -35,13 -35,10 +35,17 @@@ strongswan-5.0.
    In contrast to our own DER parser, OpenSSL can handle BER files, which is
    required for interoperability of our scepclient with EJBCA.
  
+ - Support for the proprietary IKEv1 fragmentation extension has been added.
+   Fragments are always handled on receipt but only sent if supported by the peer
+   and if enabled with the new fragmentation ipsec.conf option.
+ 
 +- IKEv1 in charon can now parse certificates received in PKCS#7 containers and
 +  supports NAT traversal as used by Windows clients. Patches courtesy of
 +  Volker Rümelin.
 +
 +- The new rdrand plugin provides a high quality / high performance random
 +  source using the Intel rdrand instruction found on Ivy Bridge processors.
 +
  strongswan-5.0.1
  ----------------