Merge branch 'ikev1-fragmentation'

This adds support for the proprietary IKEv1 fragmentation extension.

Conflicts:
	NEWS

diff --cc NEWS
index 5655a3b38fed0c705c7b078b8364e62f82034111,272020d8fa52e8aa51d8b06512967f69002aad5a..d644904b5eadfdff1156116c9cfeefe7a6a0d350
--- 1/NEWS
--- 2/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
  ----------------
  

diff --cc src/libcharon/plugins/stroke/stroke_config.c
Simple merge