514 files changed, 2 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index f1406d0e5..2dc927572 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ export FREESWANSRCDIR
 include Makefile.inc
 
 # directories visited by all recursion
-SUBDIRS=lib programs linux
+SUBDIRS=lib src linux
 
 # declaration for make's benefit
 .PHONY:	programs install clean distclean \
diff --git a/Makefile.ver b/Makefile.ver
index 435dd7311..48f2cacda 100644
--- a/Makefile.ver
+++ b/Makefile.ver
@@ -1 +1 @@
-IPSECVERSION=2.7.0
+IPSECVERSION=4.0.0
diff --git a/programs/Makefile b/src/Makefile
index 4e3ec6b10..4e3ec6b10 100644
--- a/programs/Makefile
+++ b/src/Makefile
diff --git a/programs/Makefile.program b/src/Makefile.program
index 6868c258a..6868c258a 100644
--- a/programs/Makefile.program
+++ b/src/Makefile.program
diff --git a/programs/_copyright/.cvsignore b/src/_copyright/.cvsignore
index 23ebcb381..23ebcb381 100644
--- a/programs/_copyright/.cvsignore
+++ b/src/_copyright/.cvsignore
diff --git a/programs/_copyright/Makefile b/src/_copyright/Makefile
index 52c594b68..52c594b68 100644
--- a/programs/_copyright/Makefile
+++ b/src/_copyright/Makefile
diff --git a/programs/_copyright/_copyright.8 b/src/_copyright/_copyright.8
index 87e4adc98..87e4adc98 100644
--- a/programs/_copyright/_copyright.8
+++ b/src/_copyright/_copyright.8
diff --git a/programs/_copyright/_copyright.c b/src/_copyright/_copyright.c
index 0fb360f40..0fb360f40 100644
--- a/programs/_copyright/_copyright.c
+++ b/src/_copyright/_copyright.c
diff --git a/programs/_updown/.cvsignore b/src/_updown/.cvsignore
index 81e2e4f86..81e2e4f86 100644
--- a/programs/_updown/.cvsignore
+++ b/src/_updown/.cvsignore
diff --git a/programs/_updown/Makefile b/src/_updown/Makefile
index e0aaab488..e0aaab488 100644
--- a/programs/_updown/Makefile
+++ b/src/_updown/Makefile
diff --git a/programs/_updown/_updown.8 b/src/_updown/_updown.8
index 5107d3694..5107d3694 100644
--- a/programs/_updown/_updown.8
+++ b/src/_updown/_updown.8
diff --git a/programs/_updown/_updown.in b/src/_updown/_updown.in
index 8db74f737..8db74f737 100755
--- a/programs/_updown/_updown.in
+++ b/src/_updown/_updown.in
diff --git a/programs/_updown_espmark/Makefile b/src/_updown_espmark/Makefile
index bd9cd38cb..bd9cd38cb 100644
--- a/programs/_updown_espmark/Makefile
+++ b/src/_updown_espmark/Makefile
diff --git a/programs/_updown_espmark/_updown_espmark.8 b/src/_updown_espmark/_updown_espmark.8
index 91eaa5cb7..91eaa5cb7 100644
--- a/programs/_updown_espmark/_updown_espmark.8
+++ b/src/_updown_espmark/_updown_espmark.8
diff --git a/programs/_updown_espmark/_updown_espmark.in b/src/_updown_espmark/_updown_espmark.in
index 3627d470d..3627d470d 100644
--- a/programs/_updown_espmark/_updown_espmark.in
+++ b/src/_updown_espmark/_updown_espmark.in
diff --git a/programs/charon/Doxyfile b/src/charon/Doxyfile
index 5ee25a839..5ee25a839 100644
--- a/programs/charon/Doxyfile
+++ b/src/charon/Doxyfile
diff --git a/programs/charon/Makefile b/src/charon/Makefile
index b69438b84..b69438b84 100644
--- a/programs/charon/Makefile
+++ b/src/charon/Makefile
diff --git a/programs/charon/charon.kdevelop b/src/charon/charon.kdevelop
index 270e815c4..270e815c4 100644
--- a/programs/charon/charon.kdevelop
+++ b/src/charon/charon.kdevelop
diff --git a/programs/charon/charon/Makefile.charon b/src/charon/charon/Makefile.charon
index 336495db9..336495db9 100644
--- a/programs/charon/charon/Makefile.charon
+++ b/src/charon/charon/Makefile.charon
diff --git a/programs/charon/charon/config/Makefile.config b/src/charon/charon/config/Makefile.config
index d4638b318..d4638b318 100644
--- a/programs/charon/charon/config/Makefile.config
+++ b/src/charon/charon/config/Makefile.config
diff --git a/programs/charon/charon/config/configuration.c b/src/charon/charon/config/configuration.c
index eac1bd43a..eac1bd43a 100755
--- a/programs/charon/charon/config/configuration.c
+++ b/src/charon/charon/config/configuration.c
diff --git a/programs/charon/charon/config/configuration.h b/src/charon/charon/config/configuration.h
index 6b741f9fb..6b741f9fb 100755
--- a/programs/charon/charon/config/configuration.h
+++ b/src/charon/charon/config/configuration.h
diff --git a/programs/charon/charon/config/connections/Makefile.connections b/src/charon/charon/config/connections/Makefile.connections
index 8fbc983f6..8fbc983f6 100644
--- a/programs/charon/charon/config/connections/Makefile.connections
+++ b/src/charon/charon/config/connections/Makefile.connections
diff --git a/programs/charon/charon/config/connections/connection.c b/src/charon/charon/config/connections/connection.c
index 74e6762b4..74e6762b4 100644
--- a/programs/charon/charon/config/connections/connection.c
+++ b/src/charon/charon/config/connections/connection.c
diff --git a/programs/charon/charon/config/connections/connection.h b/src/charon/charon/config/connections/connection.h
index 2cb3c20b8..2cb3c20b8 100644
--- a/programs/charon/charon/config/connections/connection.h
+++ b/src/charon/charon/config/connections/connection.h
diff --git a/programs/charon/charon/config/connections/connection_store.h b/src/charon/charon/config/connections/connection_store.h
index 41fd58e42..41fd58e42 100755
--- a/programs/charon/charon/config/connections/connection_store.h
+++ b/src/charon/charon/config/connections/connection_store.h
diff --git a/programs/charon/charon/config/connections/local_connection_store.c b/src/charon/charon/config/connections/local_connection_store.c
index 3f07f0d21..3f07f0d21 100644
--- a/programs/charon/charon/config/connections/local_connection_store.c
+++ b/src/charon/charon/config/connections/local_connection_store.c
diff --git a/programs/charon/charon/config/connections/local_connection_store.h b/src/charon/charon/config/connections/local_connection_store.h
index 14a0a24ae..14a0a24ae 100644
--- a/programs/charon/charon/config/connections/local_connection_store.h
+++ b/src/charon/charon/config/connections/local_connection_store.h
diff --git a/programs/charon/charon/config/credentials/Makefile.credentials b/src/charon/charon/config/credentials/Makefile.credentials
index 720d56656..720d56656 100644
--- a/programs/charon/charon/config/credentials/Makefile.credentials
+++ b/src/charon/charon/config/credentials/Makefile.credentials
diff --git a/programs/charon/charon/config/credentials/credential_store.h b/src/charon/charon/config/credentials/credential_store.h
index 2339469c0..2339469c0 100755
--- a/programs/charon/charon/config/credentials/credential_store.h
+++ b/src/charon/charon/config/credentials/credential_store.h
diff --git a/programs/charon/charon/config/credentials/local_credential_store.c b/src/charon/charon/config/credentials/local_credential_store.c
index dc6cb6c50..dc6cb6c50 100644
--- a/programs/charon/charon/config/credentials/local_credential_store.c
+++ b/src/charon/charon/config/credentials/local_credential_store.c
diff --git a/programs/charon/charon/config/credentials/local_credential_store.h b/src/charon/charon/config/credentials/local_credential_store.h
index ab9ef88d7..ab9ef88d7 100644
--- a/programs/charon/charon/config/credentials/local_credential_store.h
+++ b/src/charon/charon/config/credentials/local_credential_store.h
diff --git a/programs/charon/charon/config/policies/Makefile.policies b/src/charon/charon/config/policies/Makefile.policies
index e7ed8ab13..e7ed8ab13 100644
--- a/programs/charon/charon/config/policies/Makefile.policies
+++ b/src/charon/charon/config/policies/Makefile.policies
diff --git a/programs/charon/charon/config/policies/local_policy_store.c b/src/charon/charon/config/policies/local_policy_store.c
index ae02357ea..ae02357ea 100644
--- a/programs/charon/charon/config/policies/local_policy_store.c
+++ b/src/charon/charon/config/policies/local_policy_store.c
diff --git a/programs/charon/charon/config/policies/local_policy_store.h b/src/charon/charon/config/policies/local_policy_store.h
index 7ab9e0efd..7ab9e0efd 100644
--- a/programs/charon/charon/config/policies/local_policy_store.h
+++ b/src/charon/charon/config/policies/local_policy_store.h
diff --git a/programs/charon/charon/config/policies/policy.c b/src/charon/charon/config/policies/policy.c
index cff87fc6b..cff87fc6b 100644
--- a/programs/charon/charon/config/policies/policy.c
+++ b/src/charon/charon/config/policies/policy.c
diff --git a/programs/charon/charon/config/policies/policy.h b/src/charon/charon/config/policies/policy.h
index 78cda1e8b..78cda1e8b 100644
--- a/programs/charon/charon/config/policies/policy.h
+++ b/src/charon/charon/config/policies/policy.h
diff --git a/programs/charon/charon/config/policies/policy_store.h b/src/charon/charon/config/policies/policy_store.h
index 651dea634..651dea634 100755
--- a/programs/charon/charon/config/policies/policy_store.h
+++ b/src/charon/charon/config/policies/policy_store.h
diff --git a/programs/charon/charon/config/proposal.c b/src/charon/charon/config/proposal.c
index cb71a756a..cb71a756a 100644
--- a/programs/charon/charon/config/proposal.c
+++ b/src/charon/charon/config/proposal.c
diff --git a/programs/charon/charon/config/proposal.h b/src/charon/charon/config/proposal.h
index 48e3ad8d5..48e3ad8d5 100644
--- a/programs/charon/charon/config/proposal.h
+++ b/src/charon/charon/config/proposal.h
diff --git a/programs/charon/charon/config/traffic_selector.c b/src/charon/charon/config/traffic_selector.c
index 81272659a..81272659a 100644
--- a/programs/charon/charon/config/traffic_selector.c
+++ b/src/charon/charon/config/traffic_selector.c
diff --git a/programs/charon/charon/config/traffic_selector.h b/src/charon/charon/config/traffic_selector.h
index 5ac5bdeb1..5ac5bdeb1 100644
--- a/programs/charon/charon/config/traffic_selector.h
+++ b/src/charon/charon/config/traffic_selector.h
diff --git a/programs/charon/charon/daemon.c b/src/charon/charon/daemon.c
index 4b0ea54e8..4b0ea54e8 100644
--- a/programs/charon/charon/daemon.c
+++ b/src/charon/charon/daemon.c
diff --git a/programs/charon/charon/daemon.h b/src/charon/charon/daemon.h
index 5aee21fdb..5aee21fdb 100644
--- a/programs/charon/charon/daemon.h
+++ b/src/charon/charon/daemon.h
diff --git a/programs/charon/charon/encoding/Makefile.encoding b/src/charon/charon/encoding/Makefile.encoding
index ccdb42f79..ccdb42f79 100644
--- a/programs/charon/charon/encoding/Makefile.encoding
+++ b/src/charon/charon/encoding/Makefile.encoding
diff --git a/programs/charon/charon/encoding/generator.c b/src/charon/charon/encoding/generator.c
index ba12190dd..ba12190dd 100644
--- a/programs/charon/charon/encoding/generator.c
+++ b/src/charon/charon/encoding/generator.c
diff --git a/programs/charon/charon/encoding/generator.h b/src/charon/charon/encoding/generator.h
index 717d32b73..717d32b73 100644
--- a/programs/charon/charon/encoding/generator.h
+++ b/src/charon/charon/encoding/generator.h
diff --git a/programs/charon/charon/encoding/message.c b/src/charon/charon/encoding/message.c
index a57315272..a57315272 100644
--- a/programs/charon/charon/encoding/message.c
+++ b/src/charon/charon/encoding/message.c
diff --git a/programs/charon/charon/encoding/message.h b/src/charon/charon/encoding/message.h
index e3a72f439..e3a72f439 100644
--- a/programs/charon/charon/encoding/message.h
+++ b/src/charon/charon/encoding/message.h
diff --git a/programs/charon/charon/encoding/parser.c b/src/charon/charon/encoding/parser.c
index a589e9bde..a589e9bde 100644
--- a/programs/charon/charon/encoding/parser.c
+++ b/src/charon/charon/encoding/parser.c
diff --git a/programs/charon/charon/encoding/parser.h b/src/charon/charon/encoding/parser.h
index 216fac9b7..216fac9b7 100644
--- a/programs/charon/charon/encoding/parser.h
+++ b/src/charon/charon/encoding/parser.h
diff --git a/programs/charon/charon/encoding/payloads/Makefile.payloads b/src/charon/charon/encoding/payloads/Makefile.payloads
index 61d920907..61d920907 100644
--- a/programs/charon/charon/encoding/payloads/Makefile.payloads
+++ b/src/charon/charon/encoding/payloads/Makefile.payloads
diff --git a/programs/charon/charon/encoding/payloads/auth_payload.c b/src/charon/charon/encoding/payloads/auth_payload.c
index cc7c4bfb1..cc7c4bfb1 100644
--- a/programs/charon/charon/encoding/payloads/auth_payload.c
+++ b/src/charon/charon/encoding/payloads/auth_payload.c
diff --git a/programs/charon/charon/encoding/payloads/auth_payload.h b/src/charon/charon/encoding/payloads/auth_payload.h
index e099cdfef..e099cdfef 100644
--- a/programs/charon/charon/encoding/payloads/auth_payload.h
+++ b/src/charon/charon/encoding/payloads/auth_payload.h
diff --git a/programs/charon/charon/encoding/payloads/cert_payload.c b/src/charon/charon/encoding/payloads/cert_payload.c
index 146d42eda..146d42eda 100644
--- a/programs/charon/charon/encoding/payloads/cert_payload.c
+++ b/src/charon/charon/encoding/payloads/cert_payload.c
diff --git a/programs/charon/charon/encoding/payloads/cert_payload.h b/src/charon/charon/encoding/payloads/cert_payload.h
index 9148cfd31..9148cfd31 100644
--- a/programs/charon/charon/encoding/payloads/cert_payload.h
+++ b/src/charon/charon/encoding/payloads/cert_payload.h
diff --git a/programs/charon/charon/encoding/payloads/certreq_payload.c b/src/charon/charon/encoding/payloads/certreq_payload.c
index cdab82be4..cdab82be4 100644
--- a/programs/charon/charon/encoding/payloads/certreq_payload.c
+++ b/src/charon/charon/encoding/payloads/certreq_payload.c
diff --git a/programs/charon/charon/encoding/payloads/certreq_payload.h b/src/charon/charon/encoding/payloads/certreq_payload.h
index 3e88e7ffe..3e88e7ffe 100644
--- a/programs/charon/charon/encoding/payloads/certreq_payload.h
+++ b/src/charon/charon/encoding/payloads/certreq_payload.h
diff --git a/programs/charon/charon/encoding/payloads/configuration_attribute.c b/src/charon/charon/encoding/payloads/configuration_attribute.c
index 489d7f372..489d7f372 100644
--- a/programs/charon/charon/encoding/payloads/configuration_attribute.c
+++ b/src/charon/charon/encoding/payloads/configuration_attribute.c
diff --git a/programs/charon/charon/encoding/payloads/configuration_attribute.h b/src/charon/charon/encoding/payloads/configuration_attribute.h
index 5b6b4f473..5b6b4f473 100644
--- a/programs/charon/charon/encoding/payloads/configuration_attribute.h
+++ b/src/charon/charon/encoding/payloads/configuration_attribute.h
diff --git a/programs/charon/charon/encoding/payloads/cp_payload.c b/src/charon/charon/encoding/payloads/cp_payload.c
index 583488382..583488382 100644
--- a/programs/charon/charon/encoding/payloads/cp_payload.c
+++ b/src/charon/charon/encoding/payloads/cp_payload.c
diff --git a/programs/charon/charon/encoding/payloads/cp_payload.h b/src/charon/charon/encoding/payloads/cp_payload.h
index eb8076446..eb8076446 100644
--- a/programs/charon/charon/encoding/payloads/cp_payload.h
+++ b/src/charon/charon/encoding/payloads/cp_payload.h
diff --git a/programs/charon/charon/encoding/payloads/delete_payload.c b/src/charon/charon/encoding/payloads/delete_payload.c
index 28e78800f..28e78800f 100644
--- a/programs/charon/charon/encoding/payloads/delete_payload.c
+++ b/src/charon/charon/encoding/payloads/delete_payload.c
diff --git a/programs/charon/charon/encoding/payloads/delete_payload.h b/src/charon/charon/encoding/payloads/delete_payload.h
index 71a6317d4..71a6317d4 100644
--- a/programs/charon/charon/encoding/payloads/delete_payload.h
+++ b/src/charon/charon/encoding/payloads/delete_payload.h
diff --git a/programs/charon/charon/encoding/payloads/eap_payload.c b/src/charon/charon/encoding/payloads/eap_payload.c
index 2a0e17679..2a0e17679 100644
--- a/programs/charon/charon/encoding/payloads/eap_payload.c
+++ b/src/charon/charon/encoding/payloads/eap_payload.c
diff --git a/programs/charon/charon/encoding/payloads/eap_payload.h b/src/charon/charon/encoding/payloads/eap_payload.h
index 5e5a0c6d8..5e5a0c6d8 100644
--- a/programs/charon/charon/encoding/payloads/eap_payload.h
+++ b/src/charon/charon/encoding/payloads/eap_payload.h
diff --git a/programs/charon/charon/encoding/payloads/encodings.c b/src/charon/charon/encoding/payloads/encodings.c
index da39467a9..da39467a9 100644
--- a/programs/charon/charon/encoding/payloads/encodings.c
+++ b/src/charon/charon/encoding/payloads/encodings.c
diff --git a/programs/charon/charon/encoding/payloads/encodings.h b/src/charon/charon/encoding/payloads/encodings.h
index e30e1c215..e30e1c215 100644
--- a/programs/charon/charon/encoding/payloads/encodings.h
+++ b/src/charon/charon/encoding/payloads/encodings.h
diff --git a/programs/charon/charon/encoding/payloads/encryption_payload.c b/src/charon/charon/encoding/payloads/encryption_payload.c
index e0ca74ff4..e0ca74ff4 100644
--- a/programs/charon/charon/encoding/payloads/encryption_payload.c
+++ b/src/charon/charon/encoding/payloads/encryption_payload.c
diff --git a/programs/charon/charon/encoding/payloads/encryption_payload.h b/src/charon/charon/encoding/payloads/encryption_payload.h
index 77be246c5..77be246c5 100644
--- a/programs/charon/charon/encoding/payloads/encryption_payload.h
+++ b/src/charon/charon/encoding/payloads/encryption_payload.h
diff --git a/programs/charon/charon/encoding/payloads/id_payload.c b/src/charon/charon/encoding/payloads/id_payload.c
index 6a8d7738d..6a8d7738d 100644
--- a/programs/charon/charon/encoding/payloads/id_payload.c
+++ b/src/charon/charon/encoding/payloads/id_payload.c
diff --git a/programs/charon/charon/encoding/payloads/id_payload.h b/src/charon/charon/encoding/payloads/id_payload.h
index c35b44d59..c35b44d59 100644
--- a/programs/charon/charon/encoding/payloads/id_payload.h
+++ b/src/charon/charon/encoding/payloads/id_payload.h
diff --git a/programs/charon/charon/encoding/payloads/ike_header.c b/src/charon/charon/encoding/payloads/ike_header.c
index ad46d3d29..ad46d3d29 100644
--- a/programs/charon/charon/encoding/payloads/ike_header.c
+++ b/src/charon/charon/encoding/payloads/ike_header.c
diff --git a/programs/charon/charon/encoding/payloads/ike_header.h b/src/charon/charon/encoding/payloads/ike_header.h
index ec55f0e18..ec55f0e18 100644
--- a/programs/charon/charon/encoding/payloads/ike_header.h
+++ b/src/charon/charon/encoding/payloads/ike_header.h
diff --git a/programs/charon/charon/encoding/payloads/ke_payload.c b/src/charon/charon/encoding/payloads/ke_payload.c
index 0c92e033d..0c92e033d 100644
--- a/programs/charon/charon/encoding/payloads/ke_payload.c
+++ b/src/charon/charon/encoding/payloads/ke_payload.c
diff --git a/programs/charon/charon/encoding/payloads/ke_payload.h b/src/charon/charon/encoding/payloads/ke_payload.h
index 982d29754..982d29754 100644
--- a/programs/charon/charon/encoding/payloads/ke_payload.h
+++ b/src/charon/charon/encoding/payloads/ke_payload.h
diff --git a/programs/charon/charon/encoding/payloads/nonce_payload.c b/src/charon/charon/encoding/payloads/nonce_payload.c
index a7528fbfb..a7528fbfb 100644
--- a/programs/charon/charon/encoding/payloads/nonce_payload.c
+++ b/src/charon/charon/encoding/payloads/nonce_payload.c
diff --git a/programs/charon/charon/encoding/payloads/nonce_payload.h b/src/charon/charon/encoding/payloads/nonce_payload.h
index 366dfec15..366dfec15 100644
--- a/programs/charon/charon/encoding/payloads/nonce_payload.h
+++ b/src/charon/charon/encoding/payloads/nonce_payload.h
diff --git a/programs/charon/charon/encoding/payloads/notify_payload.c b/src/charon/charon/encoding/payloads/notify_payload.c
index 43d0c5322..43d0c5322 100644
--- a/programs/charon/charon/encoding/payloads/notify_payload.c
+++ b/src/charon/charon/encoding/payloads/notify_payload.c
diff --git a/programs/charon/charon/encoding/payloads/notify_payload.h b/src/charon/charon/encoding/payloads/notify_payload.h
index 093f99144..093f99144 100644
--- a/programs/charon/charon/encoding/payloads/notify_payload.h
+++ b/src/charon/charon/encoding/payloads/notify_payload.h
diff --git a/programs/charon/charon/encoding/payloads/payload.c b/src/charon/charon/encoding/payloads/payload.c
index b89e80a53..b89e80a53 100644
--- a/programs/charon/charon/encoding/payloads/payload.c
+++ b/src/charon/charon/encoding/payloads/payload.c
diff --git a/programs/charon/charon/encoding/payloads/payload.h b/src/charon/charon/encoding/payloads/payload.h
index fc3457832..fc3457832 100644
--- a/programs/charon/charon/encoding/payloads/payload.h
+++ b/src/charon/charon/encoding/payloads/payload.h
diff --git a/programs/charon/charon/encoding/payloads/proposal_substructure.c b/src/charon/charon/encoding/payloads/proposal_substructure.c
index cb3c695b2..cb3c695b2 100644
--- a/programs/charon/charon/encoding/payloads/proposal_substructure.c
+++ b/src/charon/charon/encoding/payloads/proposal_substructure.c
diff --git a/programs/charon/charon/encoding/payloads/proposal_substructure.h b/src/charon/charon/encoding/payloads/proposal_substructure.h
index 506d25800..506d25800 100644
--- a/programs/charon/charon/encoding/payloads/proposal_substructure.h
+++ b/src/charon/charon/encoding/payloads/proposal_substructure.h
diff --git a/programs/charon/charon/encoding/payloads/sa_payload.c b/src/charon/charon/encoding/payloads/sa_payload.c
index 81b4e6709..81b4e6709 100644
--- a/programs/charon/charon/encoding/payloads/sa_payload.c
+++ b/src/charon/charon/encoding/payloads/sa_payload.c
diff --git a/programs/charon/charon/encoding/payloads/sa_payload.h b/src/charon/charon/encoding/payloads/sa_payload.h
index 45095c030..45095c030 100644
--- a/programs/charon/charon/encoding/payloads/sa_payload.h
+++ b/src/charon/charon/encoding/payloads/sa_payload.h
diff --git a/programs/charon/charon/encoding/payloads/traffic_selector_substructure.c b/src/charon/charon/encoding/payloads/traffic_selector_substructure.c
index c1a461e8a..c1a461e8a 100644
--- a/programs/charon/charon/encoding/payloads/traffic_selector_substructure.c
+++ b/src/charon/charon/encoding/payloads/traffic_selector_substructure.c
diff --git a/programs/charon/charon/encoding/payloads/traffic_selector_substructure.h b/src/charon/charon/encoding/payloads/traffic_selector_substructure.h
index 755917055..755917055 100644
--- a/programs/charon/charon/encoding/payloads/traffic_selector_substructure.h
+++ b/src/charon/charon/encoding/payloads/traffic_selector_substructure.h
diff --git a/programs/charon/charon/encoding/payloads/transform_attribute.c b/src/charon/charon/encoding/payloads/transform_attribute.c
index 71cdd59e2..71cdd59e2 100644
--- a/programs/charon/charon/encoding/payloads/transform_attribute.c
+++ b/src/charon/charon/encoding/payloads/transform_attribute.c
diff --git a/programs/charon/charon/encoding/payloads/transform_attribute.h b/src/charon/charon/encoding/payloads/transform_attribute.h
index 547699915..547699915 100644
--- a/programs/charon/charon/encoding/payloads/transform_attribute.h
+++ b/src/charon/charon/encoding/payloads/transform_attribute.h
diff --git a/programs/charon/charon/encoding/payloads/transform_substructure.c b/src/charon/charon/encoding/payloads/transform_substructure.c
index 350ad63e4..350ad63e4 100644
--- a/programs/charon/charon/encoding/payloads/transform_substructure.c
+++ b/src/charon/charon/encoding/payloads/transform_substructure.c
diff --git a/programs/charon/charon/encoding/payloads/transform_substructure.h b/src/charon/charon/encoding/payloads/transform_substructure.h
index f6af3ee59..f6af3ee59 100644
--- a/programs/charon/charon/encoding/payloads/transform_substructure.h
+++ b/src/charon/charon/encoding/payloads/transform_substructure.h
diff --git a/programs/charon/charon/encoding/payloads/ts_payload.c b/src/charon/charon/encoding/payloads/ts_payload.c
index 58772e666..58772e666 100644
--- a/programs/charon/charon/encoding/payloads/ts_payload.c
+++ b/src/charon/charon/encoding/payloads/ts_payload.c
diff --git a/programs/charon/charon/encoding/payloads/ts_payload.h b/src/charon/charon/encoding/payloads/ts_payload.h
index 775ff6134..775ff6134 100644
--- a/programs/charon/charon/encoding/payloads/ts_payload.h
+++ b/src/charon/charon/encoding/payloads/ts_payload.h
diff --git a/programs/charon/charon/encoding/payloads/unknown_payload.c b/src/charon/charon/encoding/payloads/unknown_payload.c
index 25bb37d59..25bb37d59 100644
--- a/programs/charon/charon/encoding/payloads/unknown_payload.c
+++ b/src/charon/charon/encoding/payloads/unknown_payload.c
diff --git a/programs/charon/charon/encoding/payloads/unknown_payload.h b/src/charon/charon/encoding/payloads/unknown_payload.h
index 9c4926ea7..9c4926ea7 100644
--- a/programs/charon/charon/encoding/payloads/unknown_payload.h
+++ b/src/charon/charon/encoding/payloads/unknown_payload.h
diff --git a/programs/charon/charon/encoding/payloads/vendor_id_payload.c b/src/charon/charon/encoding/payloads/vendor_id_payload.c
index 436b82d79..436b82d79 100644
--- a/programs/charon/charon/encoding/payloads/vendor_id_payload.c
+++ b/src/charon/charon/encoding/payloads/vendor_id_payload.c
diff --git a/programs/charon/charon/encoding/payloads/vendor_id_payload.h b/src/charon/charon/encoding/payloads/vendor_id_payload.h
index c9ead4337..c9ead4337 100644
--- a/programs/charon/charon/encoding/payloads/vendor_id_payload.h
+++ b/src/charon/charon/encoding/payloads/vendor_id_payload.h
diff --git a/programs/charon/charon/network/Makefile.network b/src/charon/charon/network/Makefile.network
index fd99bd085..fd99bd085 100644
--- a/programs/charon/charon/network/Makefile.network
+++ b/src/charon/charon/network/Makefile.network
diff --git a/programs/charon/charon/network/packet.c b/src/charon/charon/network/packet.c
index 6cded72a3..6cded72a3 100644
--- a/programs/charon/charon/network/packet.c
+++ b/src/charon/charon/network/packet.c
diff --git a/programs/charon/charon/network/packet.h b/src/charon/charon/network/packet.h
index a2620d391..a2620d391 100644
--- a/programs/charon/charon/network/packet.h
+++ b/src/charon/charon/network/packet.h
diff --git a/programs/charon/charon/network/socket.c b/src/charon/charon/network/socket.c
index 32ff84538..32ff84538 100644
--- a/programs/charon/charon/network/socket.c
+++ b/src/charon/charon/network/socket.c
diff --git a/programs/charon/charon/network/socket.h b/src/charon/charon/network/socket.h
index 498e7700a..498e7700a 100644
--- a/programs/charon/charon/network/socket.h
+++ b/src/charon/charon/network/socket.h
diff --git a/programs/charon/charon/queues/Makefile.queues b/src/charon/charon/queues/Makefile.queues
index eeb012d2b..eeb012d2b 100644
--- a/programs/charon/charon/queues/Makefile.queues
+++ b/src/charon/charon/queues/Makefile.queues
diff --git a/programs/charon/charon/queues/event_queue.c b/src/charon/charon/queues/event_queue.c
index ece9d1513..ece9d1513 100644
--- a/programs/charon/charon/queues/event_queue.c
+++ b/src/charon/charon/queues/event_queue.c
diff --git a/programs/charon/charon/queues/event_queue.h b/src/charon/charon/queues/event_queue.h
index a60424100..a60424100 100644
--- a/programs/charon/charon/queues/event_queue.h
+++ b/src/charon/charon/queues/event_queue.h
diff --git a/programs/charon/charon/queues/job_queue.c b/src/charon/charon/queues/job_queue.c
index 3640395ab..3640395ab 100644
--- a/programs/charon/charon/queues/job_queue.c
+++ b/src/charon/charon/queues/job_queue.c
diff --git a/programs/charon/charon/queues/job_queue.h b/src/charon/charon/queues/job_queue.h
index 9fcf08001..9fcf08001 100644
--- a/programs/charon/charon/queues/job_queue.h
+++ b/src/charon/charon/queues/job_queue.h
diff --git a/programs/charon/charon/queues/jobs/Makefile.jobs b/src/charon/charon/queues/jobs/Makefile.jobs
index db89987bc..db89987bc 100644
--- a/programs/charon/charon/queues/jobs/Makefile.jobs
+++ b/src/charon/charon/queues/jobs/Makefile.jobs
diff --git a/programs/charon/charon/queues/jobs/delete_established_ike_sa_job.c b/src/charon/charon/queues/jobs/delete_established_ike_sa_job.c
index 7251e2ca4..7251e2ca4 100644
--- a/programs/charon/charon/queues/jobs/delete_established_ike_sa_job.c
+++ b/src/charon/charon/queues/jobs/delete_established_ike_sa_job.c
diff --git a/programs/charon/charon/queues/jobs/delete_established_ike_sa_job.h b/src/charon/charon/queues/jobs/delete_established_ike_sa_job.h
index 762dceae6..762dceae6 100644
--- a/programs/charon/charon/queues/jobs/delete_established_ike_sa_job.h
+++ b/src/charon/charon/queues/jobs/delete_established_ike_sa_job.h
diff --git a/programs/charon/charon/queues/jobs/delete_half_open_ike_sa_job.c b/src/charon/charon/queues/jobs/delete_half_open_ike_sa_job.c
index 610285e20..610285e20 100644
--- a/programs/charon/charon/queues/jobs/delete_half_open_ike_sa_job.c
+++ b/src/charon/charon/queues/jobs/delete_half_open_ike_sa_job.c
diff --git a/programs/charon/charon/queues/jobs/delete_half_open_ike_sa_job.h b/src/charon/charon/queues/jobs/delete_half_open_ike_sa_job.h
index ea42be8f2..ea42be8f2 100644
--- a/programs/charon/charon/queues/jobs/delete_half_open_ike_sa_job.h
+++ b/src/charon/charon/queues/jobs/delete_half_open_ike_sa_job.h
diff --git a/programs/charon/charon/queues/jobs/incoming_packet_job.c b/src/charon/charon/queues/jobs/incoming_packet_job.c
index fc71f63ea..fc71f63ea 100644
--- a/programs/charon/charon/queues/jobs/incoming_packet_job.c
+++ b/src/charon/charon/queues/jobs/incoming_packet_job.c
diff --git a/programs/charon/charon/queues/jobs/incoming_packet_job.h b/src/charon/charon/queues/jobs/incoming_packet_job.h
index e3fb5797e..e3fb5797e 100644
--- a/programs/charon/charon/queues/jobs/incoming_packet_job.h
+++ b/src/charon/charon/queues/jobs/incoming_packet_job.h
diff --git a/programs/charon/charon/queues/jobs/initiate_ike_sa_job.c b/src/charon/charon/queues/jobs/initiate_ike_sa_job.c
index ac9ace36c..ac9ace36c 100644
--- a/programs/charon/charon/queues/jobs/initiate_ike_sa_job.c
+++ b/src/charon/charon/queues/jobs/initiate_ike_sa_job.c
diff --git a/programs/charon/charon/queues/jobs/initiate_ike_sa_job.h b/src/charon/charon/queues/jobs/initiate_ike_sa_job.h
index cee31f07b..cee31f07b 100644
--- a/programs/charon/charon/queues/jobs/initiate_ike_sa_job.h
+++ b/src/charon/charon/queues/jobs/initiate_ike_sa_job.h
diff --git a/programs/charon/charon/queues/jobs/job.c b/src/charon/charon/queues/jobs/job.c
index df739f9e5..df739f9e5 100644
--- a/programs/charon/charon/queues/jobs/job.c
+++ b/src/charon/charon/queues/jobs/job.c
diff --git a/programs/charon/charon/queues/jobs/job.h b/src/charon/charon/queues/jobs/job.h
index eea4da09e..eea4da09e 100644
--- a/programs/charon/charon/queues/jobs/job.h
+++ b/src/charon/charon/queues/jobs/job.h
diff --git a/programs/charon/charon/queues/jobs/retransmit_request_job.c b/src/charon/charon/queues/jobs/retransmit_request_job.c
index e171df5bd..e171df5bd 100644
--- a/programs/charon/charon/queues/jobs/retransmit_request_job.c
+++ b/src/charon/charon/queues/jobs/retransmit_request_job.c
diff --git a/programs/charon/charon/queues/jobs/retransmit_request_job.h b/src/charon/charon/queues/jobs/retransmit_request_job.h
index 2349d3f5e..2349d3f5e 100644
--- a/programs/charon/charon/queues/jobs/retransmit_request_job.h
+++ b/src/charon/charon/queues/jobs/retransmit_request_job.h
diff --git a/programs/charon/charon/queues/send_queue.c b/src/charon/charon/queues/send_queue.c
index 0852e5303..0852e5303 100644
--- a/programs/charon/charon/queues/send_queue.c
+++ b/src/charon/charon/queues/send_queue.c
diff --git a/programs/charon/charon/queues/send_queue.h b/src/charon/charon/queues/send_queue.h
index 6dc5867eb..6dc5867eb 100644
--- a/programs/charon/charon/queues/send_queue.h
+++ b/src/charon/charon/queues/send_queue.h
diff --git a/programs/charon/charon/sa/Makefile.sa b/src/charon/charon/sa/Makefile.sa
index 825c19959..825c19959 100644
--- a/programs/charon/charon/sa/Makefile.sa
+++ b/src/charon/charon/sa/Makefile.sa
diff --git a/programs/charon/charon/sa/authenticator.c b/src/charon/charon/sa/authenticator.c
index 3aeb8795f..3aeb8795f 100644
--- a/programs/charon/charon/sa/authenticator.c
+++ b/src/charon/charon/sa/authenticator.c
diff --git a/programs/charon/charon/sa/authenticator.h b/src/charon/charon/sa/authenticator.h
index b6bc317ac..b6bc317ac 100644
--- a/programs/charon/charon/sa/authenticator.h
+++ b/src/charon/charon/sa/authenticator.h
diff --git a/programs/charon/charon/sa/child_sa.c b/src/charon/charon/sa/child_sa.c
index a678ea9b8..a678ea9b8 100644
--- a/programs/charon/charon/sa/child_sa.c
+++ b/src/charon/charon/sa/child_sa.c
diff --git a/programs/charon/charon/sa/child_sa.h b/src/charon/charon/sa/child_sa.h
index 6ccbff13f..6ccbff13f 100644
--- a/programs/charon/charon/sa/child_sa.h
+++ b/src/charon/charon/sa/child_sa.h
diff --git a/programs/charon/charon/sa/ike_sa.c b/src/charon/charon/sa/ike_sa.c
index 6322eb8e9..6322eb8e9 100644
--- a/programs/charon/charon/sa/ike_sa.c
+++ b/src/charon/charon/sa/ike_sa.c
diff --git a/programs/charon/charon/sa/ike_sa.h b/src/charon/charon/sa/ike_sa.h
index c526c6347..c526c6347 100644
--- a/programs/charon/charon/sa/ike_sa.h
+++ b/src/charon/charon/sa/ike_sa.h
diff --git a/programs/charon/charon/sa/ike_sa_id.c b/src/charon/charon/sa/ike_sa_id.c
index bf3a05d11..bf3a05d11 100644
--- a/programs/charon/charon/sa/ike_sa_id.c
+++ b/src/charon/charon/sa/ike_sa_id.c
diff --git a/programs/charon/charon/sa/ike_sa_id.h b/src/charon/charon/sa/ike_sa_id.h
index 0f16f7637..0f16f7637 100644
--- a/programs/charon/charon/sa/ike_sa_id.h
+++ b/src/charon/charon/sa/ike_sa_id.h
diff --git a/programs/charon/charon/sa/ike_sa_manager.c b/src/charon/charon/sa/ike_sa_manager.c
index 01f3f5ad2..01f3f5ad2 100644
--- a/programs/charon/charon/sa/ike_sa_manager.c
+++ b/src/charon/charon/sa/ike_sa_manager.c
diff --git a/programs/charon/charon/sa/ike_sa_manager.h b/src/charon/charon/sa/ike_sa_manager.h
index e2235b4b6..e2235b4b6 100644
--- a/programs/charon/charon/sa/ike_sa_manager.h
+++ b/src/charon/charon/sa/ike_sa_manager.h
diff --git a/programs/charon/charon/sa/states/Makefile.states b/src/charon/charon/sa/states/Makefile.states
index a258ebef0..a258ebef0 100644
--- a/programs/charon/charon/sa/states/Makefile.states
+++ b/src/charon/charon/sa/states/Makefile.states
diff --git a/programs/charon/charon/sa/states/ike_auth_requested.c b/src/charon/charon/sa/states/ike_auth_requested.c
index 3d49f440f..3d49f440f 100644
--- a/programs/charon/charon/sa/states/ike_auth_requested.c
+++ b/src/charon/charon/sa/states/ike_auth_requested.c
diff --git a/programs/charon/charon/sa/states/ike_auth_requested.h b/src/charon/charon/sa/states/ike_auth_requested.h
index a8eef014c..a8eef014c 100644
--- a/programs/charon/charon/sa/states/ike_auth_requested.h
+++ b/src/charon/charon/sa/states/ike_auth_requested.h
diff --git a/programs/charon/charon/sa/states/ike_sa_established.c b/src/charon/charon/sa/states/ike_sa_established.c
index e91409f6a..e91409f6a 100644
--- a/programs/charon/charon/sa/states/ike_sa_established.c
+++ b/src/charon/charon/sa/states/ike_sa_established.c
diff --git a/programs/charon/charon/sa/states/ike_sa_established.h b/src/charon/charon/sa/states/ike_sa_established.h
index 8477ad5bc..8477ad5bc 100644
--- a/programs/charon/charon/sa/states/ike_sa_established.h
+++ b/src/charon/charon/sa/states/ike_sa_established.h
diff --git a/programs/charon/charon/sa/states/ike_sa_init_requested.c b/src/charon/charon/sa/states/ike_sa_init_requested.c
index 311cdf0a0..311cdf0a0 100644
--- a/programs/charon/charon/sa/states/ike_sa_init_requested.c
+++ b/src/charon/charon/sa/states/ike_sa_init_requested.c
diff --git a/programs/charon/charon/sa/states/ike_sa_init_requested.h b/src/charon/charon/sa/states/ike_sa_init_requested.h
index 0a43afad1..0a43afad1 100644
--- a/programs/charon/charon/sa/states/ike_sa_init_requested.h
+++ b/src/charon/charon/sa/states/ike_sa_init_requested.h
diff --git a/programs/charon/charon/sa/states/ike_sa_init_responded.c b/src/charon/charon/sa/states/ike_sa_init_responded.c
index e40b0cf22..e40b0cf22 100644
--- a/programs/charon/charon/sa/states/ike_sa_init_responded.c
+++ b/src/charon/charon/sa/states/ike_sa_init_responded.c
diff --git a/programs/charon/charon/sa/states/ike_sa_init_responded.h b/src/charon/charon/sa/states/ike_sa_init_responded.h
index 43aecf26f..43aecf26f 100644
--- a/programs/charon/charon/sa/states/ike_sa_init_responded.h
+++ b/src/charon/charon/sa/states/ike_sa_init_responded.h
diff --git a/programs/charon/charon/sa/states/initiator_init.c b/src/charon/charon/sa/states/initiator_init.c
index 35d15235d..35d15235d 100644
--- a/programs/charon/charon/sa/states/initiator_init.c
+++ b/src/charon/charon/sa/states/initiator_init.c
diff --git a/programs/charon/charon/sa/states/initiator_init.h b/src/charon/charon/sa/states/initiator_init.h
index 6b4940a73..6b4940a73 100644
--- a/programs/charon/charon/sa/states/initiator_init.h
+++ b/src/charon/charon/sa/states/initiator_init.h
diff --git a/programs/charon/charon/sa/states/responder_init.c b/src/charon/charon/sa/states/responder_init.c
index 10acf645c..10acf645c 100644
--- a/programs/charon/charon/sa/states/responder_init.c
+++ b/src/charon/charon/sa/states/responder_init.c
diff --git a/programs/charon/charon/sa/states/responder_init.h b/src/charon/charon/sa/states/responder_init.h
index c8ba73ea3..c8ba73ea3 100644
--- a/programs/charon/charon/sa/states/responder_init.h
+++ b/src/charon/charon/sa/states/responder_init.h
diff --git a/programs/charon/charon/sa/states/state.c b/src/charon/charon/sa/states/state.c
index 595f5abbb..595f5abbb 100644
--- a/programs/charon/charon/sa/states/state.c
+++ b/src/charon/charon/sa/states/state.c
diff --git a/programs/charon/charon/sa/states/state.h b/src/charon/charon/sa/states/state.h
index c93068d35..c93068d35 100644
--- a/programs/charon/charon/sa/states/state.h
+++ b/src/charon/charon/sa/states/state.h
diff --git a/programs/charon/charon/threads/Makefile.threads b/src/charon/charon/threads/Makefile.threads
index 949c1ad24..949c1ad24 100644
--- a/programs/charon/charon/threads/Makefile.threads
+++ b/src/charon/charon/threads/Makefile.threads
diff --git a/programs/charon/charon/threads/kernel_interface.c b/src/charon/charon/threads/kernel_interface.c
index 679cf69ee..679cf69ee 100644
--- a/programs/charon/charon/threads/kernel_interface.c
+++ b/src/charon/charon/threads/kernel_interface.c
diff --git a/programs/charon/charon/threads/kernel_interface.h b/src/charon/charon/threads/kernel_interface.h
index ceafa6468..ceafa6468 100644
--- a/programs/charon/charon/threads/kernel_interface.h
+++ b/src/charon/charon/threads/kernel_interface.h
diff --git a/programs/charon/charon/threads/receiver.c b/src/charon/charon/threads/receiver.c
index 0cf8b7bde..0cf8b7bde 100644
--- a/programs/charon/charon/threads/receiver.c
+++ b/src/charon/charon/threads/receiver.c
diff --git a/programs/charon/charon/threads/receiver.h b/src/charon/charon/threads/receiver.h
index 932774f5f..932774f5f 100644
--- a/programs/charon/charon/threads/receiver.h
+++ b/src/charon/charon/threads/receiver.h
diff --git a/programs/charon/charon/threads/scheduler.c b/src/charon/charon/threads/scheduler.c
index 47c5d6fb9..47c5d6fb9 100644
--- a/programs/charon/charon/threads/scheduler.c
+++ b/src/charon/charon/threads/scheduler.c
diff --git a/programs/charon/charon/threads/scheduler.h b/src/charon/charon/threads/scheduler.h
index 0165a718b..0165a718b 100644
--- a/programs/charon/charon/threads/scheduler.h
+++ b/src/charon/charon/threads/scheduler.h
diff --git a/programs/charon/charon/threads/sender.c b/src/charon/charon/threads/sender.c
index 42d11beb9..42d11beb9 100644
--- a/programs/charon/charon/threads/sender.c
+++ b/src/charon/charon/threads/sender.c
diff --git a/programs/charon/charon/threads/sender.h b/src/charon/charon/threads/sender.h
index ea8124147..ea8124147 100644
--- a/programs/charon/charon/threads/sender.h
+++ b/src/charon/charon/threads/sender.h
diff --git a/programs/charon/charon/threads/stroke_interface.c b/src/charon/charon/threads/stroke_interface.c
index ef5d5f1f6..ef5d5f1f6 100755
--- a/programs/charon/charon/threads/stroke_interface.c
+++ b/src/charon/charon/threads/stroke_interface.c
diff --git a/programs/charon/charon/threads/stroke_interface.h b/src/charon/charon/threads/stroke_interface.h
index f8efc9c67..f8efc9c67 100644
--- a/programs/charon/charon/threads/stroke_interface.h
+++ b/src/charon/charon/threads/stroke_interface.h
diff --git a/programs/charon/charon/threads/thread_pool.c b/src/charon/charon/threads/thread_pool.c
index 4482e795f..4482e795f 100644
--- a/programs/charon/charon/threads/thread_pool.c
+++ b/src/charon/charon/threads/thread_pool.c
diff --git a/programs/charon/charon/threads/thread_pool.h b/src/charon/charon/threads/thread_pool.h
index b33be08e3..b33be08e3 100644
--- a/programs/charon/charon/threads/thread_pool.h
+++ b/src/charon/charon/threads/thread_pool.h
diff --git a/programs/charon/doc/Architecture.txt b/src/charon/doc/Architecture.txt
index 14b99274c..14b99274c 100644
--- a/programs/charon/doc/Architecture.txt
+++ b/src/charon/doc/Architecture.txt
diff --git a/programs/charon/doc/Known-bugs.txt b/src/charon/doc/Known-bugs.txt
index 3f594ad79..3f594ad79 100644
--- a/programs/charon/doc/Known-bugs.txt
+++ b/src/charon/doc/Known-bugs.txt
diff --git a/programs/charon/doc/Todo-list.txt b/src/charon/doc/Todo-list.txt
index 11b30fb7d..11b30fb7d 100644
--- a/programs/charon/doc/Todo-list.txt
+++ b/src/charon/doc/Todo-list.txt
diff --git a/programs/charon/lib/Makefile.lib b/src/charon/lib/Makefile.lib
index 80a44ff69..80a44ff69 100644
--- a/programs/charon/lib/Makefile.lib
+++ b/src/charon/lib/Makefile.lib
diff --git a/programs/charon/lib/asn1/Makefile.asn1 b/src/charon/lib/asn1/Makefile.asn1
index 3a5450d50..3a5450d50 100644
--- a/programs/charon/lib/asn1/Makefile.asn1
+++ b/src/charon/lib/asn1/Makefile.asn1
diff --git a/programs/charon/lib/asn1/asn1.c b/src/charon/lib/asn1/asn1.c
index c847461b6..c847461b6 100644
--- a/programs/charon/lib/asn1/asn1.c
+++ b/src/charon/lib/asn1/asn1.c
diff --git a/programs/charon/lib/asn1/asn1.h b/src/charon/lib/asn1/asn1.h
index 556bb2b05..556bb2b05 100644
--- a/programs/charon/lib/asn1/asn1.h
+++ b/src/charon/lib/asn1/asn1.h
diff --git a/programs/charon/lib/asn1/oid.c b/src/charon/lib/asn1/oid.c
index 4b0632de2..4b0632de2 100644
--- a/programs/charon/lib/asn1/oid.c
+++ b/src/charon/lib/asn1/oid.c
diff --git a/programs/charon/lib/asn1/oid.h b/src/charon/lib/asn1/oid.h
index a9265d43f..a9265d43f 100644
--- a/programs/charon/lib/asn1/oid.h
+++ b/src/charon/lib/asn1/oid.h
diff --git a/programs/charon/lib/asn1/oid.pl b/src/charon/lib/asn1/oid.pl
index a3725e57d..a3725e57d 100644
--- a/programs/charon/lib/asn1/oid.pl
+++ b/src/charon/lib/asn1/oid.pl
diff --git a/programs/charon/lib/asn1/oid.txt b/src/charon/lib/asn1/oid.txt
index eed46d59d..eed46d59d 100644
--- a/programs/charon/lib/asn1/oid.txt
+++ b/src/charon/lib/asn1/oid.txt
diff --git a/programs/charon/lib/asn1/pem.c b/src/charon/lib/asn1/pem.c
index b02268dd9..b02268dd9 100755
--- a/programs/charon/lib/asn1/pem.c
+++ b/src/charon/lib/asn1/pem.c
diff --git a/programs/charon/lib/asn1/pem.h b/src/charon/lib/asn1/pem.h
index a4332fd34..a4332fd34 100755
--- a/programs/charon/lib/asn1/pem.h
+++ b/src/charon/lib/asn1/pem.h
diff --git a/programs/charon/lib/asn1/ttodata.c b/src/charon/lib/asn1/ttodata.c
index 5e8149955..5e8149955 100644
--- a/programs/charon/lib/asn1/ttodata.c
+++ b/src/charon/lib/asn1/ttodata.c
diff --git a/programs/charon/lib/asn1/ttodata.h b/src/charon/lib/asn1/ttodata.h
index d57244ef5..d57244ef5 100644
--- a/programs/charon/lib/asn1/ttodata.h
+++ b/src/charon/lib/asn1/ttodata.h
diff --git a/programs/charon/lib/crypto/Makefile.transforms b/src/charon/lib/crypto/Makefile.transforms
index af0b147da..af0b147da 100644
--- a/programs/charon/lib/crypto/Makefile.transforms
+++ b/src/charon/lib/crypto/Makefile.transforms
diff --git a/programs/charon/lib/crypto/crypters/Makefile.crypters b/src/charon/lib/crypto/crypters/Makefile.crypters
index 612477de8..612477de8 100644
--- a/programs/charon/lib/crypto/crypters/Makefile.crypters
+++ b/src/charon/lib/crypto/crypters/Makefile.crypters
diff --git a/programs/charon/lib/crypto/crypters/aes_cbc_crypter.c b/src/charon/lib/crypto/crypters/aes_cbc_crypter.c
index 9b7b07c62..9b7b07c62 100644
--- a/programs/charon/lib/crypto/crypters/aes_cbc_crypter.c
+++ b/src/charon/lib/crypto/crypters/aes_cbc_crypter.c
diff --git a/programs/charon/lib/crypto/crypters/aes_cbc_crypter.h b/src/charon/lib/crypto/crypters/aes_cbc_crypter.h
index d7a3c0f5b..d7a3c0f5b 100644
--- a/programs/charon/lib/crypto/crypters/aes_cbc_crypter.h
+++ b/src/charon/lib/crypto/crypters/aes_cbc_crypter.h
diff --git a/programs/charon/lib/crypto/crypters/crypter.c b/src/charon/lib/crypto/crypters/crypter.c
index 827d10228..827d10228 100644
--- a/programs/charon/lib/crypto/crypters/crypter.c
+++ b/src/charon/lib/crypto/crypters/crypter.c
diff --git a/programs/charon/lib/crypto/crypters/crypter.h b/src/charon/lib/crypto/crypters/crypter.h
index 9c219f5cc..9c219f5cc 100644
--- a/programs/charon/lib/crypto/crypters/crypter.h
+++ b/src/charon/lib/crypto/crypters/crypter.h
diff --git a/programs/charon/lib/crypto/diffie_hellman.c b/src/charon/lib/crypto/diffie_hellman.c
index e458fb80f..e458fb80f 100644
--- a/programs/charon/lib/crypto/diffie_hellman.c
+++ b/src/charon/lib/crypto/diffie_hellman.c
diff --git a/programs/charon/lib/crypto/diffie_hellman.h b/src/charon/lib/crypto/diffie_hellman.h
index 48a165557..48a165557 100644
--- a/programs/charon/lib/crypto/diffie_hellman.h
+++ b/src/charon/lib/crypto/diffie_hellman.h
diff --git a/programs/charon/lib/crypto/hashers/Makefile.hashers b/src/charon/lib/crypto/hashers/Makefile.hashers
index e05d41af3..e05d41af3 100644
--- a/programs/charon/lib/crypto/hashers/Makefile.hashers
+++ b/src/charon/lib/crypto/hashers/Makefile.hashers
diff --git a/programs/charon/lib/crypto/hashers/hasher.c b/src/charon/lib/crypto/hashers/hasher.c
index c15f41804..c15f41804 100644
--- a/programs/charon/lib/crypto/hashers/hasher.c
+++ b/src/charon/lib/crypto/hashers/hasher.c
diff --git a/programs/charon/lib/crypto/hashers/hasher.h b/src/charon/lib/crypto/hashers/hasher.h
index 24683c01b..24683c01b 100644
--- a/programs/charon/lib/crypto/hashers/hasher.h
+++ b/src/charon/lib/crypto/hashers/hasher.h
diff --git a/programs/charon/lib/crypto/hashers/md5_hasher.c b/src/charon/lib/crypto/hashers/md5_hasher.c
index bd3ab0c62..bd3ab0c62 100644
--- a/programs/charon/lib/crypto/hashers/md5_hasher.c
+++ b/src/charon/lib/crypto/hashers/md5_hasher.c
diff --git a/programs/charon/lib/crypto/hashers/md5_hasher.h b/src/charon/lib/crypto/hashers/md5_hasher.h
index 1e6d95d19..1e6d95d19 100644
--- a/programs/charon/lib/crypto/hashers/md5_hasher.h
+++ b/src/charon/lib/crypto/hashers/md5_hasher.h
diff --git a/programs/charon/lib/crypto/hashers/sha1_hasher.c b/src/charon/lib/crypto/hashers/sha1_hasher.c
index 2b82ef4ba..2b82ef4ba 100644
--- a/programs/charon/lib/crypto/hashers/sha1_hasher.c
+++ b/src/charon/lib/crypto/hashers/sha1_hasher.c
diff --git a/programs/charon/lib/crypto/hashers/sha1_hasher.h b/src/charon/lib/crypto/hashers/sha1_hasher.h
index 5124ea1a8..5124ea1a8 100644
--- a/programs/charon/lib/crypto/hashers/sha1_hasher.h
+++ b/src/charon/lib/crypto/hashers/sha1_hasher.h
diff --git a/programs/charon/lib/crypto/hmac.c b/src/charon/lib/crypto/hmac.c
index bb8880770..bb8880770 100644
--- a/programs/charon/lib/crypto/hmac.c
+++ b/src/charon/lib/crypto/hmac.c
diff --git a/programs/charon/lib/crypto/hmac.h b/src/charon/lib/crypto/hmac.h
index 8945fc1fc..8945fc1fc 100644
--- a/programs/charon/lib/crypto/hmac.h
+++ b/src/charon/lib/crypto/hmac.h
diff --git a/programs/charon/lib/crypto/prf_plus.c b/src/charon/lib/crypto/prf_plus.c
index d408d0517..d408d0517 100644
--- a/programs/charon/lib/crypto/prf_plus.c
+++ b/src/charon/lib/crypto/prf_plus.c
diff --git a/programs/charon/lib/crypto/prf_plus.h b/src/charon/lib/crypto/prf_plus.h
index bdcd01966..bdcd01966 100644
--- a/programs/charon/lib/crypto/prf_plus.h
+++ b/src/charon/lib/crypto/prf_plus.h
diff --git a/programs/charon/lib/crypto/prfs/Makefile.prfs b/src/charon/lib/crypto/prfs/Makefile.prfs
index a98894346..a98894346 100644
--- a/programs/charon/lib/crypto/prfs/Makefile.prfs
+++ b/src/charon/lib/crypto/prfs/Makefile.prfs
diff --git a/programs/charon/lib/crypto/prfs/hmac_prf.c b/src/charon/lib/crypto/prfs/hmac_prf.c
index 2a7d34a3a..2a7d34a3a 100644
--- a/programs/charon/lib/crypto/prfs/hmac_prf.c
+++ b/src/charon/lib/crypto/prfs/hmac_prf.c
diff --git a/programs/charon/lib/crypto/prfs/hmac_prf.h b/src/charon/lib/crypto/prfs/hmac_prf.h
index 3a68960f7..3a68960f7 100644
--- a/programs/charon/lib/crypto/prfs/hmac_prf.h
+++ b/src/charon/lib/crypto/prfs/hmac_prf.h
diff --git a/programs/charon/lib/crypto/prfs/prf.c b/src/charon/lib/crypto/prfs/prf.c
index bb7015e64..bb7015e64 100644
--- a/programs/charon/lib/crypto/prfs/prf.c
+++ b/src/charon/lib/crypto/prfs/prf.c
diff --git a/programs/charon/lib/crypto/prfs/prf.h b/src/charon/lib/crypto/prfs/prf.h
index b1c1e6a66..b1c1e6a66 100644
--- a/programs/charon/lib/crypto/prfs/prf.h
+++ b/src/charon/lib/crypto/prfs/prf.h
diff --git a/programs/charon/lib/crypto/rsa/Makefile.rsa b/src/charon/lib/crypto/rsa/Makefile.rsa
index 1a0204c83..1a0204c83 100644
--- a/programs/charon/lib/crypto/rsa/Makefile.rsa
+++ b/src/charon/lib/crypto/rsa/Makefile.rsa
diff --git a/programs/charon/lib/crypto/rsa/rsa_private_key.c b/src/charon/lib/crypto/rsa/rsa_private_key.c
index 358653f0e..358653f0e 100644
--- a/programs/charon/lib/crypto/rsa/rsa_private_key.c
+++ b/src/charon/lib/crypto/rsa/rsa_private_key.c
diff --git a/programs/charon/lib/crypto/rsa/rsa_private_key.h b/src/charon/lib/crypto/rsa/rsa_private_key.h
index b3b8ae87f..b3b8ae87f 100644
--- a/programs/charon/lib/crypto/rsa/rsa_private_key.h
+++ b/src/charon/lib/crypto/rsa/rsa_private_key.h
diff --git a/programs/charon/lib/crypto/rsa/rsa_public_key.c b/src/charon/lib/crypto/rsa/rsa_public_key.c
index 6601b6cda..6601b6cda 100644
--- a/programs/charon/lib/crypto/rsa/rsa_public_key.c
+++ b/src/charon/lib/crypto/rsa/rsa_public_key.c
diff --git a/programs/charon/lib/crypto/rsa/rsa_public_key.h b/src/charon/lib/crypto/rsa/rsa_public_key.h
index ef79153d6..ef79153d6 100644
--- a/programs/charon/lib/crypto/rsa/rsa_public_key.h
+++ b/src/charon/lib/crypto/rsa/rsa_public_key.h
diff --git a/programs/charon/lib/crypto/signers/Makefile.signers b/src/charon/lib/crypto/signers/Makefile.signers
index 8f161a09d..8f161a09d 100644
--- a/programs/charon/lib/crypto/signers/Makefile.signers
+++ b/src/charon/lib/crypto/signers/Makefile.signers
diff --git a/programs/charon/lib/crypto/signers/hmac_signer.c b/src/charon/lib/crypto/signers/hmac_signer.c
index cb7d08244..cb7d08244 100644
--- a/programs/charon/lib/crypto/signers/hmac_signer.c
+++ b/src/charon/lib/crypto/signers/hmac_signer.c
diff --git a/programs/charon/lib/crypto/signers/hmac_signer.h b/src/charon/lib/crypto/signers/hmac_signer.h
index 62427167e..62427167e 100644
--- a/programs/charon/lib/crypto/signers/hmac_signer.h
+++ b/src/charon/lib/crypto/signers/hmac_signer.h
diff --git a/programs/charon/lib/crypto/signers/signer.c b/src/charon/lib/crypto/signers/signer.c
index 3e6378957..3e6378957 100644
--- a/programs/charon/lib/crypto/signers/signer.c
+++ b/src/charon/lib/crypto/signers/signer.c
diff --git a/programs/charon/lib/crypto/signers/signer.h b/src/charon/lib/crypto/signers/signer.h
index 9625af813..9625af813 100644
--- a/programs/charon/lib/crypto/signers/signer.h
+++ b/src/charon/lib/crypto/signers/signer.h
diff --git a/programs/charon/lib/crypto/x509.c b/src/charon/lib/crypto/x509.c
index 86a595618..86a595618 100755
--- a/programs/charon/lib/crypto/x509.c
+++ b/src/charon/lib/crypto/x509.c
diff --git a/programs/charon/lib/crypto/x509.h b/src/charon/lib/crypto/x509.h
index 077238eab..077238eab 100755
--- a/programs/charon/lib/crypto/x509.h
+++ b/src/charon/lib/crypto/x509.h
diff --git a/programs/charon/lib/definitions.c b/src/charon/lib/definitions.c
index 59c97a29b..59c97a29b 100644
--- a/programs/charon/lib/definitions.c
+++ b/src/charon/lib/definitions.c
diff --git a/programs/charon/lib/definitions.h b/src/charon/lib/definitions.h
index c9ef066c1..c9ef066c1 100644
--- a/programs/charon/lib/definitions.h
+++ b/src/charon/lib/definitions.h
diff --git a/programs/charon/lib/library.c b/src/charon/lib/library.c
index fa9c732bf..fa9c732bf 100644
--- a/programs/charon/lib/library.c
+++ b/src/charon/lib/library.c
diff --git a/programs/charon/lib/library.h b/src/charon/lib/library.h
index da96befe1..da96befe1 100644
--- a/programs/charon/lib/library.h
+++ b/src/charon/lib/library.h
diff --git a/programs/charon/lib/types.c b/src/charon/lib/types.c
index 09ebf7310..09ebf7310 100644
--- a/programs/charon/lib/types.c
+++ b/src/charon/lib/types.c
diff --git a/programs/charon/lib/types.h b/src/charon/lib/types.h
index 0e0782b31..0e0782b31 100644
--- a/programs/charon/lib/types.h
+++ b/src/charon/lib/types.h
diff --git a/programs/charon/lib/utils/Makefile.utils b/src/charon/lib/utils/Makefile.utils
index 1c82283d7..1c82283d7 100644
--- a/programs/charon/lib/utils/Makefile.utils
+++ b/src/charon/lib/utils/Makefile.utils
diff --git a/programs/charon/lib/utils/host.c b/src/charon/lib/utils/host.c
index 020ed27f3..020ed27f3 100644
--- a/programs/charon/lib/utils/host.c
+++ b/src/charon/lib/utils/host.c
diff --git a/programs/charon/lib/utils/host.h b/src/charon/lib/utils/host.h
index d81efffa6..d81efffa6 100644
--- a/programs/charon/lib/utils/host.h
+++ b/src/charon/lib/utils/host.h
diff --git a/programs/charon/lib/utils/identification.c b/src/charon/lib/utils/identification.c
index 33f3d92cd..33f3d92cd 100644
--- a/programs/charon/lib/utils/identification.c
+++ b/src/charon/lib/utils/identification.c
diff --git a/programs/charon/lib/utils/identification.h b/src/charon/lib/utils/identification.h
index 309b6858c..309b6858c 100644
--- a/programs/charon/lib/utils/identification.h
+++ b/src/charon/lib/utils/identification.h
diff --git a/programs/charon/lib/utils/iterator.h b/src/charon/lib/utils/iterator.h
index de81db8e9..de81db8e9 100644
--- a/programs/charon/lib/utils/iterator.h
+++ b/src/charon/lib/utils/iterator.h
diff --git a/programs/charon/lib/utils/leak_detective.c b/src/charon/lib/utils/leak_detective.c
index 780ba4c05..780ba4c05 100644
--- a/programs/charon/lib/utils/leak_detective.c
+++ b/src/charon/lib/utils/leak_detective.c
diff --git a/programs/charon/lib/utils/leak_detective.h b/src/charon/lib/utils/leak_detective.h
index 13c0d01ab..13c0d01ab 100644
--- a/programs/charon/lib/utils/leak_detective.h
+++ b/src/charon/lib/utils/leak_detective.h
diff --git a/programs/charon/lib/utils/linked_list.c b/src/charon/lib/utils/linked_list.c
index 64443434b..64443434b 100644
--- a/programs/charon/lib/utils/linked_list.c
+++ b/src/charon/lib/utils/linked_list.c
diff --git a/programs/charon/lib/utils/linked_list.h b/src/charon/lib/utils/linked_list.h
index 8647f064d..8647f064d 100644
--- a/programs/charon/lib/utils/linked_list.h
+++ b/src/charon/lib/utils/linked_list.h
diff --git a/programs/charon/lib/utils/logger.c b/src/charon/lib/utils/logger.c
index fdaeddff0..fdaeddff0 100644
--- a/programs/charon/lib/utils/logger.c
+++ b/src/charon/lib/utils/logger.c
diff --git a/programs/charon/lib/utils/logger.h b/src/charon/lib/utils/logger.h
index dec73078e..dec73078e 100644
--- a/programs/charon/lib/utils/logger.h
+++ b/src/charon/lib/utils/logger.h
diff --git a/programs/charon/lib/utils/logger_manager.c b/src/charon/lib/utils/logger_manager.c
index ecbe1a6c1..ecbe1a6c1 100644
--- a/programs/charon/lib/utils/logger_manager.c
+++ b/src/charon/lib/utils/logger_manager.c
diff --git a/programs/charon/lib/utils/logger_manager.h b/src/charon/lib/utils/logger_manager.h
index a3ff5a37e..a3ff5a37e 100644
--- a/programs/charon/lib/utils/logger_manager.h
+++ b/src/charon/lib/utils/logger_manager.h
diff --git a/programs/charon/lib/utils/randomizer.c b/src/charon/lib/utils/randomizer.c
index 09e81894e..09e81894e 100644
--- a/programs/charon/lib/utils/randomizer.c
+++ b/src/charon/lib/utils/randomizer.c
diff --git a/programs/charon/lib/utils/randomizer.h b/src/charon/lib/utils/randomizer.h
index 55519550e..55519550e 100644
--- a/programs/charon/lib/utils/randomizer.h
+++ b/src/charon/lib/utils/randomizer.h
diff --git a/programs/charon/lib/utils/tester.c b/src/charon/lib/utils/tester.c
index a7599dd82..a7599dd82 100644
--- a/programs/charon/lib/utils/tester.c
+++ b/src/charon/lib/utils/tester.c
diff --git a/programs/charon/lib/utils/tester.h b/src/charon/lib/utils/tester.h
index 3decb2039..3decb2039 100644
--- a/programs/charon/lib/utils/tester.h
+++ b/src/charon/lib/utils/tester.h
diff --git a/programs/charon/patches/strongswan-2.7.0.patch b/src/charon/patches/strongswan-2.7.0.patch
index b21e1013b..b21e1013b 100644
--- a/programs/charon/patches/strongswan-2.7.0.patch
+++ b/src/charon/patches/strongswan-2.7.0.patch
diff --git a/programs/charon/scripts/alice-key.der b/src/charon/scripts/alice-key.der
index 5a8aef6cb..5a8aef6cb 100644
--- a/programs/charon/scripts/alice-key.der
+++ b/src/charon/scripts/alice-key.der
diff --git a/programs/charon/scripts/alice.der b/src/charon/scripts/alice.der
index 8154defd9..8154defd9 100644
--- a/programs/charon/scripts/alice.der
+++ b/src/charon/scripts/alice.der
diff --git a/programs/charon/scripts/bob-key.der b/src/charon/scripts/bob-key.der
index f944dec9f..f944dec9f 100644
--- a/programs/charon/scripts/bob-key.der
+++ b/src/charon/scripts/bob-key.der
diff --git a/programs/charon/scripts/bob.der b/src/charon/scripts/bob.der
index 401611888..401611888 100644
--- a/programs/charon/scripts/bob.der
+++ b/src/charon/scripts/bob.der
diff --git a/programs/charon/scripts/complex1.der b/src/charon/scripts/complex1.der
index ba460cbee..ba460cbee 100644
--- a/programs/charon/scripts/complex1.der
+++ b/src/charon/scripts/complex1.der
diff --git a/programs/charon/scripts/complex2.der b/src/charon/scripts/complex2.der
index 160b21f47..160b21f47 100644
--- a/programs/charon/scripts/complex2.der
+++ b/src/charon/scripts/complex2.der
diff --git a/programs/charon/scripts/daemon-loop.sh b/src/charon/scripts/daemon-loop.sh
index 9a361e012..9a361e012 100755
--- a/programs/charon/scripts/daemon-loop.sh
+++ b/src/charon/scripts/daemon-loop.sh
diff --git a/programs/charon/scripts/deleteline b/src/charon/scripts/deleteline
index 9f529dccc..9f529dccc 100755
--- a/programs/charon/scripts/deleteline
+++ b/src/charon/scripts/deleteline
diff --git a/programs/charon/scripts/replace b/src/charon/scripts/replace
index adfc8e09a..adfc8e09a 100755
--- a/programs/charon/scripts/replace
+++ b/src/charon/scripts/replace
diff --git a/programs/charon/scripts/to-alice.sh b/src/charon/scripts/to-alice.sh
index 01ba27f5b..01ba27f5b 100755
--- a/programs/charon/scripts/to-alice.sh
+++ b/src/charon/scripts/to-alice.sh
diff --git a/programs/charon/scripts/to-bob.sh b/src/charon/scripts/to-bob.sh
index df30bd893..df30bd893 100755
--- a/programs/charon/scripts/to-bob.sh
+++ b/src/charon/scripts/to-bob.sh
diff --git a/programs/charon/stroke/Makefile.stroke b/src/charon/stroke/Makefile.stroke
index c87445095..c87445095 100644
--- a/programs/charon/stroke/Makefile.stroke
+++ b/src/charon/stroke/Makefile.stroke
diff --git a/programs/charon/stroke/stroke.c b/src/charon/stroke/stroke.c
index 9ecda0413..9ecda0413 100644
--- a/programs/charon/stroke/stroke.c
+++ b/src/charon/stroke/stroke.c
diff --git a/programs/charon/stroke/stroke.h b/src/charon/stroke/stroke.h
index cb40cf843..cb40cf843 100644
--- a/programs/charon/stroke/stroke.h
+++ b/src/charon/stroke/stroke.h
diff --git a/programs/charon/testing/Makefile.testcases b/src/charon/testing/Makefile.testcases
index 5a261a799..5a261a799 100644
--- a/programs/charon/testing/Makefile.testcases
+++ b/src/charon/testing/Makefile.testcases
diff --git a/programs/charon/testing/aes_cbc_crypter_test.c b/src/charon/testing/aes_cbc_crypter_test.c
index 30dae3926..30dae3926 100644
--- a/programs/charon/testing/aes_cbc_crypter_test.c
+++ b/src/charon/testing/aes_cbc_crypter_test.c
diff --git a/programs/charon/testing/aes_cbc_crypter_test.h b/src/charon/testing/aes_cbc_crypter_test.h
index c3897a4d6..c3897a4d6 100644
--- a/programs/charon/testing/aes_cbc_crypter_test.h
+++ b/src/charon/testing/aes_cbc_crypter_test.h
diff --git a/programs/charon/testing/certificate_test.c b/src/charon/testing/certificate_test.c
index be8a8f7cf..be8a8f7cf 100644
--- a/programs/charon/testing/certificate_test.c
+++ b/src/charon/testing/certificate_test.c
diff --git a/programs/charon/testing/certificate_test.h b/src/charon/testing/certificate_test.h
index 8dcbd0f93..8dcbd0f93 100644
--- a/programs/charon/testing/certificate_test.h
+++ b/src/charon/testing/certificate_test.h
diff --git a/programs/charon/testing/child_sa_test.c b/src/charon/testing/child_sa_test.c
index 0cf354c26..0cf354c26 100644
--- a/programs/charon/testing/child_sa_test.c
+++ b/src/charon/testing/child_sa_test.c
diff --git a/programs/charon/testing/child_sa_test.h b/src/charon/testing/child_sa_test.h
index ef92499fe..ef92499fe 100644
--- a/programs/charon/testing/child_sa_test.h
+++ b/src/charon/testing/child_sa_test.h
diff --git a/programs/charon/testing/connection_test.c b/src/charon/testing/connection_test.c
index 6b12afc1d..6b12afc1d 100644
--- a/programs/charon/testing/connection_test.c
+++ b/src/charon/testing/connection_test.c
diff --git a/programs/charon/testing/connection_test.h b/src/charon/testing/connection_test.h
index 4d2a1d89e..4d2a1d89e 100644
--- a/programs/charon/testing/connection_test.h
+++ b/src/charon/testing/connection_test.h
diff --git a/programs/charon/testing/diffie_hellman_test.c b/src/charon/testing/diffie_hellman_test.c
index 0a44a022a..0a44a022a 100644
--- a/programs/charon/testing/diffie_hellman_test.c
+++ b/src/charon/testing/diffie_hellman_test.c
diff --git a/programs/charon/testing/diffie_hellman_test.h b/src/charon/testing/diffie_hellman_test.h
index e6e3ff608..e6e3ff608 100644
--- a/programs/charon/testing/diffie_hellman_test.h
+++ b/src/charon/testing/diffie_hellman_test.h
diff --git a/programs/charon/testing/encryption_payload_test.c b/src/charon/testing/encryption_payload_test.c
index 9e4108b9e..9e4108b9e 100644
--- a/programs/charon/testing/encryption_payload_test.c
+++ b/src/charon/testing/encryption_payload_test.c
diff --git a/programs/charon/testing/encryption_payload_test.h b/src/charon/testing/encryption_payload_test.h
index 5e6353bfd..5e6353bfd 100644
--- a/programs/charon/testing/encryption_payload_test.h
+++ b/src/charon/testing/encryption_payload_test.h
diff --git a/programs/charon/testing/event_queue_test.c b/src/charon/testing/event_queue_test.c
index 58a214051..58a214051 100644
--- a/programs/charon/testing/event_queue_test.c
+++ b/src/charon/testing/event_queue_test.c
diff --git a/programs/charon/testing/event_queue_test.h b/src/charon/testing/event_queue_test.h
index 5f8c47fad..5f8c47fad 100644
--- a/programs/charon/testing/event_queue_test.h
+++ b/src/charon/testing/event_queue_test.h
diff --git a/programs/charon/testing/generator_test.c b/src/charon/testing/generator_test.c
index 004c700e6..004c700e6 100644
--- a/programs/charon/testing/generator_test.c
+++ b/src/charon/testing/generator_test.c
diff --git a/programs/charon/testing/generator_test.h b/src/charon/testing/generator_test.h
index 204255fb7..204255fb7 100644
--- a/programs/charon/testing/generator_test.h
+++ b/src/charon/testing/generator_test.h
diff --git a/programs/charon/testing/hasher_test.c b/src/charon/testing/hasher_test.c
index 9130a2092..9130a2092 100644
--- a/programs/charon/testing/hasher_test.c
+++ b/src/charon/testing/hasher_test.c
diff --git a/programs/charon/testing/hasher_test.h b/src/charon/testing/hasher_test.h
index cc6fe52c8..cc6fe52c8 100644
--- a/programs/charon/testing/hasher_test.h
+++ b/src/charon/testing/hasher_test.h
diff --git a/programs/charon/testing/hmac_signer_test.c b/src/charon/testing/hmac_signer_test.c
index a1ac8ea43..a1ac8ea43 100644
--- a/programs/charon/testing/hmac_signer_test.c
+++ b/src/charon/testing/hmac_signer_test.c
diff --git a/programs/charon/testing/hmac_signer_test.h b/src/charon/testing/hmac_signer_test.h
index 4a2459a8e..4a2459a8e 100644
--- a/programs/charon/testing/hmac_signer_test.h
+++ b/src/charon/testing/hmac_signer_test.h
diff --git a/programs/charon/testing/hmac_test.c b/src/charon/testing/hmac_test.c
index c1341257c..c1341257c 100644
--- a/programs/charon/testing/hmac_test.c
+++ b/src/charon/testing/hmac_test.c
diff --git a/programs/charon/testing/hmac_test.h b/src/charon/testing/hmac_test.h
index 1eef93cd3..1eef93cd3 100644
--- a/programs/charon/testing/hmac_test.h
+++ b/src/charon/testing/hmac_test.h
diff --git a/programs/charon/testing/identification_test.c b/src/charon/testing/identification_test.c
index b148b53e0..b148b53e0 100644
--- a/programs/charon/testing/identification_test.c
+++ b/src/charon/testing/identification_test.c
diff --git a/programs/charon/testing/identification_test.h b/src/charon/testing/identification_test.h
index b1078c52f..b1078c52f 100644
--- a/programs/charon/testing/identification_test.h
+++ b/src/charon/testing/identification_test.h
diff --git a/programs/charon/testing/ike_sa_id_test.c b/src/charon/testing/ike_sa_id_test.c
index ba44363fb..ba44363fb 100644
--- a/programs/charon/testing/ike_sa_id_test.c
+++ b/src/charon/testing/ike_sa_id_test.c
diff --git a/programs/charon/testing/ike_sa_id_test.h b/src/charon/testing/ike_sa_id_test.h
index 75429e4fb..75429e4fb 100644
--- a/programs/charon/testing/ike_sa_id_test.h
+++ b/src/charon/testing/ike_sa_id_test.h
diff --git a/programs/charon/testing/ike_sa_manager_test.c b/src/charon/testing/ike_sa_manager_test.c
index 5247be7f0..5247be7f0 100644
--- a/programs/charon/testing/ike_sa_manager_test.c
+++ b/src/charon/testing/ike_sa_manager_test.c
diff --git a/programs/charon/testing/ike_sa_manager_test.h b/src/charon/testing/ike_sa_manager_test.h
index c3e9f99f1..c3e9f99f1 100644
--- a/programs/charon/testing/ike_sa_manager_test.h
+++ b/src/charon/testing/ike_sa_manager_test.h
diff --git a/programs/charon/testing/ike_sa_test.c b/src/charon/testing/ike_sa_test.c
index 798b5edc9..798b5edc9 100644
--- a/programs/charon/testing/ike_sa_test.c
+++ b/src/charon/testing/ike_sa_test.c
diff --git a/programs/charon/testing/ike_sa_test.h b/src/charon/testing/ike_sa_test.h
index e93bc34fd..e93bc34fd 100644
--- a/programs/charon/testing/ike_sa_test.h
+++ b/src/charon/testing/ike_sa_test.h
diff --git a/programs/charon/testing/job_queue_test.c b/src/charon/testing/job_queue_test.c
index 336a9a188..336a9a188 100644
--- a/programs/charon/testing/job_queue_test.c
+++ b/src/charon/testing/job_queue_test.c
diff --git a/programs/charon/testing/job_queue_test.h b/src/charon/testing/job_queue_test.h
index f2d3edc4c..f2d3edc4c 100644
--- a/programs/charon/testing/job_queue_test.h
+++ b/src/charon/testing/job_queue_test.h
diff --git a/programs/charon/testing/kernel_interface_test.c b/src/charon/testing/kernel_interface_test.c
index 86553e15e..86553e15e 100644
--- a/programs/charon/testing/kernel_interface_test.c
+++ b/src/charon/testing/kernel_interface_test.c
diff --git a/programs/charon/testing/kernel_interface_test.h b/src/charon/testing/kernel_interface_test.h
index fc8dab4b6..fc8dab4b6 100644
--- a/programs/charon/testing/kernel_interface_test.h
+++ b/src/charon/testing/kernel_interface_test.h
diff --git a/programs/charon/testing/leak_detective_test.c b/src/charon/testing/leak_detective_test.c
index 8d71d9f0f..8d71d9f0f 100644
--- a/programs/charon/testing/leak_detective_test.c
+++ b/src/charon/testing/leak_detective_test.c
diff --git a/programs/charon/testing/leak_detective_test.h b/src/charon/testing/leak_detective_test.h
index e64266bd5..e64266bd5 100644
--- a/programs/charon/testing/leak_detective_test.h
+++ b/src/charon/testing/leak_detective_test.h
diff --git a/programs/charon/testing/linked_list_test.c b/src/charon/testing/linked_list_test.c
index 3d5666f64..3d5666f64 100644
--- a/programs/charon/testing/linked_list_test.c
+++ b/src/charon/testing/linked_list_test.c
diff --git a/programs/charon/testing/linked_list_test.h b/src/charon/testing/linked_list_test.h
index a9773f8f0..a9773f8f0 100644
--- a/programs/charon/testing/linked_list_test.h
+++ b/src/charon/testing/linked_list_test.h
diff --git a/programs/charon/testing/packet_test.c b/src/charon/testing/packet_test.c
index fdb195ec1..fdb195ec1 100644
--- a/programs/charon/testing/packet_test.c
+++ b/src/charon/testing/packet_test.c
diff --git a/programs/charon/testing/packet_test.h b/src/charon/testing/packet_test.h
index 8bc297e1b..8bc297e1b 100644
--- a/programs/charon/testing/packet_test.h
+++ b/src/charon/testing/packet_test.h
diff --git a/programs/charon/testing/parser_test.c b/src/charon/testing/parser_test.c
index 263c6eb70..263c6eb70 100644
--- a/programs/charon/testing/parser_test.c
+++ b/src/charon/testing/parser_test.c
diff --git a/programs/charon/testing/parser_test.h b/src/charon/testing/parser_test.h
index 4956df13e..4956df13e 100644
--- a/programs/charon/testing/parser_test.h
+++ b/src/charon/testing/parser_test.h
diff --git a/programs/charon/testing/policy_test.c b/src/charon/testing/policy_test.c
index 9003eeff0..9003eeff0 100644
--- a/programs/charon/testing/policy_test.c
+++ b/src/charon/testing/policy_test.c
diff --git a/programs/charon/testing/policy_test.h b/src/charon/testing/policy_test.h
index 6c8072a9c..6c8072a9c 100644
--- a/programs/charon/testing/policy_test.h
+++ b/src/charon/testing/policy_test.h
diff --git a/programs/charon/testing/prf_plus_test.c b/src/charon/testing/prf_plus_test.c
index 818c5c17e..818c5c17e 100644
--- a/programs/charon/testing/prf_plus_test.c
+++ b/src/charon/testing/prf_plus_test.c
diff --git a/programs/charon/testing/prf_plus_test.h b/src/charon/testing/prf_plus_test.h
index 2ad8ce0c1..2ad8ce0c1 100644
--- a/programs/charon/testing/prf_plus_test.h
+++ b/src/charon/testing/prf_plus_test.h
diff --git a/programs/charon/testing/proposal_test.c b/src/charon/testing/proposal_test.c
index 1b16390d3..1b16390d3 100644
--- a/programs/charon/testing/proposal_test.c
+++ b/src/charon/testing/proposal_test.c
diff --git a/programs/charon/testing/proposal_test.h b/src/charon/testing/proposal_test.h
index 059af11cc..059af11cc 100644
--- a/programs/charon/testing/proposal_test.h
+++ b/src/charon/testing/proposal_test.h
diff --git a/programs/charon/testing/rsa_test.c b/src/charon/testing/rsa_test.c
index 696901531..696901531 100644
--- a/programs/charon/testing/rsa_test.c
+++ b/src/charon/testing/rsa_test.c
diff --git a/programs/charon/testing/rsa_test.h b/src/charon/testing/rsa_test.h
index baeccf402..baeccf402 100644
--- a/programs/charon/testing/rsa_test.h
+++ b/src/charon/testing/rsa_test.h
diff --git a/programs/charon/testing/scheduler_test.c b/src/charon/testing/scheduler_test.c
index de7346d83..de7346d83 100644
--- a/programs/charon/testing/scheduler_test.c
+++ b/src/charon/testing/scheduler_test.c
diff --git a/programs/charon/testing/scheduler_test.h b/src/charon/testing/scheduler_test.h
index 746848e49..746848e49 100644
--- a/programs/charon/testing/scheduler_test.h
+++ b/src/charon/testing/scheduler_test.h
diff --git a/programs/charon/testing/send_queue_test.c b/src/charon/testing/send_queue_test.c
index a56f8e5a2..a56f8e5a2 100644
--- a/programs/charon/testing/send_queue_test.c
+++ b/src/charon/testing/send_queue_test.c
diff --git a/programs/charon/testing/send_queue_test.h b/src/charon/testing/send_queue_test.h
index 138657e10..138657e10 100644
--- a/programs/charon/testing/send_queue_test.h
+++ b/src/charon/testing/send_queue_test.h
diff --git a/programs/charon/testing/sender_test.c b/src/charon/testing/sender_test.c
index 391d71fbc..391d71fbc 100644
--- a/programs/charon/testing/sender_test.c
+++ b/src/charon/testing/sender_test.c
diff --git a/programs/charon/testing/sender_test.h b/src/charon/testing/sender_test.h
index 1fdfed69d..1fdfed69d 100644
--- a/programs/charon/testing/sender_test.h
+++ b/src/charon/testing/sender_test.h
diff --git a/programs/charon/testing/socket_test.c b/src/charon/testing/socket_test.c
index 9ae1b0fbc..9ae1b0fbc 100644
--- a/programs/charon/testing/socket_test.c
+++ b/src/charon/testing/socket_test.c
diff --git a/programs/charon/testing/socket_test.h b/src/charon/testing/socket_test.h
index a59995297..a59995297 100644
--- a/programs/charon/testing/socket_test.h
+++ b/src/charon/testing/socket_test.h
diff --git a/programs/charon/testing/testcases.c b/src/charon/testing/testcases.c
index e4d92becf..e4d92becf 100644
--- a/programs/charon/testing/testcases.c
+++ b/src/charon/testing/testcases.c
diff --git a/programs/charon/testing/thread_pool_test.c b/src/charon/testing/thread_pool_test.c
index ee7a5101f..ee7a5101f 100644
--- a/programs/charon/testing/thread_pool_test.c
+++ b/src/charon/testing/thread_pool_test.c
diff --git a/programs/charon/testing/thread_pool_test.h b/src/charon/testing/thread_pool_test.h
index bdae797b7..bdae797b7 100644
--- a/programs/charon/testing/thread_pool_test.h
+++ b/src/charon/testing/thread_pool_test.h
diff --git a/programs/ipsec/.cvsignore b/src/ipsec/.cvsignore
index 70025a7f8..70025a7f8 100644
--- a/programs/ipsec/.cvsignore
+++ b/src/ipsec/.cvsignore
diff --git a/programs/ipsec/Makefile b/src/ipsec/Makefile
index fdff3728a..fdff3728a 100644
--- a/programs/ipsec/Makefile
+++ b/src/ipsec/Makefile
diff --git a/programs/ipsec/distro.txt b/src/ipsec/distro.txt
index 80f4192a4..80f4192a4 100644
--- a/programs/ipsec/distro.txt
+++ b/src/ipsec/distro.txt
diff --git a/programs/ipsec/ipsec.8 b/src/ipsec/ipsec.8
index 823289372..823289372 100644
--- a/programs/ipsec/ipsec.8
+++ b/src/ipsec/ipsec.8
diff --git a/programs/ipsec/ipsec.in b/src/ipsec/ipsec.in
index 04156e8ae..04156e8ae 100755
--- a/programs/ipsec/ipsec.in
+++ b/src/ipsec/ipsec.in
diff --git a/programs/openac/Makefile b/src/openac/Makefile
index 7aeacee0a..7aeacee0a 100644
--- a/programs/openac/Makefile
+++ b/src/openac/Makefile
diff --git a/programs/openac/build.c b/src/openac/build.c
index bd3df6fee..bd3df6fee 100644
--- a/programs/openac/build.c
+++ b/src/openac/build.c
diff --git a/programs/openac/build.h b/src/openac/build.h
index deeddda04..deeddda04 100644
--- a/programs/openac/build.h
+++ b/src/openac/build.h
diff --git a/programs/openac/loglite.c b/src/openac/loglite.c
index b1763cc9f..b1763cc9f 100644
--- a/programs/openac/loglite.c
+++ b/src/openac/loglite.c
diff --git a/programs/openac/openac.8 b/src/openac/openac.8
index 8e609a1b1..8e609a1b1 100644
--- a/programs/openac/openac.8
+++ b/src/openac/openac.8
diff --git a/programs/openac/openac.c b/src/openac/openac.c
index 524a302d7..524a302d7 100755
--- a/programs/openac/openac.c
+++ b/src/openac/openac.c
diff --git a/programs/pluto/.cvsignore b/src/pluto/.cvsignore
index fb96dae41..fb96dae41 100644
--- a/programs/pluto/.cvsignore
+++ b/src/pluto/.cvsignore
diff --git a/programs/pluto/Makefile b/src/pluto/Makefile
index c2660fd4f..c2660fd4f 100644
--- a/programs/pluto/Makefile
+++ b/src/pluto/Makefile
diff --git a/programs/pluto/PLUTO-CONVENTIONS b/src/pluto/PLUTO-CONVENTIONS
index 5288dd2bb..5288dd2bb 100644
--- a/programs/pluto/PLUTO-CONVENTIONS
+++ b/src/pluto/PLUTO-CONVENTIONS
diff --git a/programs/pluto/TODO b/src/pluto/TODO
index 7db4a9ebc..7db4a9ebc 100644
--- a/programs/pluto/TODO
+++ b/src/pluto/TODO
diff --git a/programs/pluto/ac.c b/src/pluto/ac.c
index bcf5f80d1..bcf5f80d1 100644
--- a/programs/pluto/ac.c
+++ b/src/pluto/ac.c
diff --git a/programs/pluto/ac.h b/src/pluto/ac.h
index 3913d745d..3913d745d 100644
--- a/programs/pluto/ac.h
+++ b/src/pluto/ac.h
diff --git a/programs/pluto/adns.c b/src/pluto/adns.c
index c5977d23c..c5977d23c 100644
--- a/programs/pluto/adns.c
+++ b/src/pluto/adns.c
diff --git a/programs/pluto/adns.h b/src/pluto/adns.h
index 00fc4ad07..00fc4ad07 100644
--- a/programs/pluto/adns.h
+++ b/src/pluto/adns.h
diff --git a/programs/pluto/alg/Config.ike_alg b/src/pluto/alg/Config.ike_alg
index 0fcda4cad..0fcda4cad 100644
--- a/programs/pluto/alg/Config.ike_alg
+++ b/src/pluto/alg/Config.ike_alg
diff --git a/programs/pluto/alg/Makefile b/src/pluto/alg/Makefile
index 9732cc80e..9732cc80e 100644
--- a/programs/pluto/alg/Makefile
+++ b/src/pluto/alg/Makefile
diff --git a/programs/pluto/alg/Makefile.ike_alg_aes b/src/pluto/alg/Makefile.ike_alg_aes
index 12009ba5c..12009ba5c 100644
--- a/programs/pluto/alg/Makefile.ike_alg_aes
+++ b/src/pluto/alg/Makefile.ike_alg_aes
diff --git a/programs/pluto/alg/Makefile.ike_alg_blowfish b/src/pluto/alg/Makefile.ike_alg_blowfish
index c3af6199b..c3af6199b 100644
--- a/programs/pluto/alg/Makefile.ike_alg_blowfish
+++ b/src/pluto/alg/Makefile.ike_alg_blowfish
diff --git a/programs/pluto/alg/Makefile.ike_alg_serpent b/src/pluto/alg/Makefile.ike_alg_serpent
index 3395ac0ea..3395ac0ea 100644
--- a/programs/pluto/alg/Makefile.ike_alg_serpent
+++ b/src/pluto/alg/Makefile.ike_alg_serpent
diff --git a/programs/pluto/alg/Makefile.ike_alg_sha2 b/src/pluto/alg/Makefile.ike_alg_sha2
index 67e68a667..67e68a667 100644
--- a/programs/pluto/alg/Makefile.ike_alg_sha2
+++ b/src/pluto/alg/Makefile.ike_alg_sha2
diff --git a/programs/pluto/alg/Makefile.ike_alg_twofish b/src/pluto/alg/Makefile.ike_alg_twofish
index dcd30dd3e..dcd30dd3e 100644
--- a/programs/pluto/alg/Makefile.ike_alg_twofish
+++ b/src/pluto/alg/Makefile.ike_alg_twofish
diff --git a/programs/pluto/alg/ike_alg_aes.c b/src/pluto/alg/ike_alg_aes.c
index 44de09b4c..44de09b4c 100644
--- a/programs/pluto/alg/ike_alg_aes.c
+++ b/src/pluto/alg/ike_alg_aes.c
diff --git a/programs/pluto/alg/ike_alg_blowfish.c b/src/pluto/alg/ike_alg_blowfish.c
index 2bbef051b..2bbef051b 100644
--- a/programs/pluto/alg/ike_alg_blowfish.c
+++ b/src/pluto/alg/ike_alg_blowfish.c
diff --git a/programs/pluto/alg/ike_alg_serpent.c b/src/pluto/alg/ike_alg_serpent.c
index fb01caa41..fb01caa41 100644
--- a/programs/pluto/alg/ike_alg_serpent.c
+++ b/src/pluto/alg/ike_alg_serpent.c
diff --git a/programs/pluto/alg/ike_alg_sha2.c b/src/pluto/alg/ike_alg_sha2.c
index ad24f7cf0..ad24f7cf0 100644
--- a/programs/pluto/alg/ike_alg_sha2.c
+++ b/src/pluto/alg/ike_alg_sha2.c
diff --git a/programs/pluto/alg/ike_alg_twofish.c b/src/pluto/alg/ike_alg_twofish.c
index 1788bc394..1788bc394 100644
--- a/programs/pluto/alg/ike_alg_twofish.c
+++ b/src/pluto/alg/ike_alg_twofish.c
diff --git a/programs/pluto/alg_info.c b/src/pluto/alg_info.c
index 4ac7f2ca9..4ac7f2ca9 100644
--- a/programs/pluto/alg_info.c
+++ b/src/pluto/alg_info.c
diff --git a/programs/pluto/alg_info.h b/src/pluto/alg_info.h
index cd2011dcc..cd2011dcc 100644
--- a/programs/pluto/alg_info.h
+++ b/src/pluto/alg_info.h
diff --git a/programs/pluto/asn1.c b/src/pluto/asn1.c
index 0663bc490..0663bc490 100644
--- a/programs/pluto/asn1.c
+++ b/src/pluto/asn1.c
diff --git a/programs/pluto/asn1.h b/src/pluto/asn1.h
index 2a3fb3e9e..2a3fb3e9e 100644
--- a/programs/pluto/asn1.h
+++ b/src/pluto/asn1.h
diff --git a/programs/pluto/ca.c b/src/pluto/ca.c
index c1e0261d8..c1e0261d8 100644
--- a/programs/pluto/ca.c
+++ b/src/pluto/ca.c
diff --git a/programs/pluto/ca.h b/src/pluto/ca.h
index 8d4602dc6..8d4602dc6 100644
--- a/programs/pluto/ca.h
+++ b/src/pluto/ca.h
diff --git a/programs/pluto/certs.c b/src/pluto/certs.c
index 92b40605f..92b40605f 100644
--- a/programs/pluto/certs.c
+++ b/src/pluto/certs.c
diff --git a/programs/pluto/certs.h b/src/pluto/certs.h
index cca128965..cca128965 100644
--- a/programs/pluto/certs.h
+++ b/src/pluto/certs.h
diff --git a/programs/pluto/connections.c b/src/pluto/connections.c
index 263bdbd1e..263bdbd1e 100644
--- a/programs/pluto/connections.c
+++ b/src/pluto/connections.c
diff --git a/programs/pluto/connections.h b/src/pluto/connections.h
index 6dfddbe22..6dfddbe22 100644
--- a/programs/pluto/connections.h
+++ b/src/pluto/connections.h
diff --git a/programs/pluto/constants.c b/src/pluto/constants.c
index 27e4db1e0..27e4db1e0 100644
--- a/programs/pluto/constants.c
+++ b/src/pluto/constants.c
diff --git a/programs/pluto/constants.h b/src/pluto/constants.h
index b66d002ee..b66d002ee 100644
--- a/programs/pluto/constants.h
+++ b/src/pluto/constants.h
diff --git a/programs/pluto/cookie.c b/src/pluto/cookie.c
index 458120e46..458120e46 100644
--- a/programs/pluto/cookie.c
+++ b/src/pluto/cookie.c
diff --git a/programs/pluto/cookie.h b/src/pluto/cookie.h
index f5b0e64d1..f5b0e64d1 100644
--- a/programs/pluto/cookie.h
+++ b/src/pluto/cookie.h
diff --git a/programs/pluto/crl.c b/src/pluto/crl.c
index 8d4b3bd7b..8d4b3bd7b 100644
--- a/programs/pluto/crl.c
+++ b/src/pluto/crl.c
diff --git a/programs/pluto/crl.h b/src/pluto/crl.h
index 9f985b6cd..9f985b6cd 100644
--- a/programs/pluto/crl.h
+++ b/src/pluto/crl.h
diff --git a/programs/pluto/crypto.c b/src/pluto/crypto.c
index 24939bd04..24939bd04 100644
--- a/programs/pluto/crypto.c
+++ b/src/pluto/crypto.c
diff --git a/programs/pluto/crypto.h b/src/pluto/crypto.h
index d29475af2..d29475af2 100644
--- a/programs/pluto/crypto.h
+++ b/src/pluto/crypto.h
diff --git a/programs/pluto/db_ops.c b/src/pluto/db_ops.c
index bbcd7918f..bbcd7918f 100644
--- a/programs/pluto/db_ops.c
+++ b/src/pluto/db_ops.c
diff --git a/programs/pluto/db_ops.h b/src/pluto/db_ops.h
index 433e75280..433e75280 100644
--- a/programs/pluto/db_ops.h
+++ b/src/pluto/db_ops.h
diff --git a/programs/pluto/defs.c b/src/pluto/defs.c
index 16f6a3949..16f6a3949 100644
--- a/programs/pluto/defs.c
+++ b/src/pluto/defs.c
diff --git a/programs/pluto/defs.h b/src/pluto/defs.h
index 7e92ea540..7e92ea540 100644
--- a/programs/pluto/defs.h
+++ b/src/pluto/defs.h
diff --git a/programs/pluto/demux.c b/src/pluto/demux.c
index bbd50f93c..bbd50f93c 100644
--- a/programs/pluto/demux.c
+++ b/src/pluto/demux.c
diff --git a/programs/pluto/demux.h b/src/pluto/demux.h
index 7adac44f3..7adac44f3 100644
--- a/programs/pluto/demux.h
+++ b/src/pluto/demux.h
diff --git a/programs/pluto/dnskey.c b/src/pluto/dnskey.c
index 9aca1938d..9aca1938d 100644
--- a/programs/pluto/dnskey.c
+++ b/src/pluto/dnskey.c
diff --git a/programs/pluto/dnskey.h b/src/pluto/dnskey.h
index 0b9f0ee33..0b9f0ee33 100644
--- a/programs/pluto/dnskey.h
+++ b/src/pluto/dnskey.h
diff --git a/programs/pluto/dsa.c b/src/pluto/dsa.c
index c5982fbf4..c5982fbf4 100644
--- a/programs/pluto/dsa.c
+++ b/src/pluto/dsa.c
diff --git a/programs/pluto/dsa.h b/src/pluto/dsa.h
index 1456d65b6..1456d65b6 100644
--- a/programs/pluto/dsa.h
+++ b/src/pluto/dsa.h
diff --git a/programs/pluto/elgamal.c b/src/pluto/elgamal.c
index 0c099bb90..0c099bb90 100644
--- a/programs/pluto/elgamal.c
+++ b/src/pluto/elgamal.c
diff --git a/programs/pluto/elgamal.h b/src/pluto/elgamal.h
index f104c2a52..f104c2a52 100644
--- a/programs/pluto/elgamal.h
+++ b/src/pluto/elgamal.h
diff --git a/programs/pluto/fetch.c b/src/pluto/fetch.c
index 075b88fd2..075b88fd2 100644
--- a/programs/pluto/fetch.c
+++ b/src/pluto/fetch.c
diff --git a/programs/pluto/fetch.h b/src/pluto/fetch.h
index 6303f37e4..6303f37e4 100644
--- a/programs/pluto/fetch.h
+++ b/src/pluto/fetch.h
diff --git a/programs/pluto/foodgroups.c b/src/pluto/foodgroups.c
index 52e32f0fb..52e32f0fb 100644
--- a/programs/pluto/foodgroups.c
+++ b/src/pluto/foodgroups.c
diff --git a/programs/pluto/foodgroups.h b/src/pluto/foodgroups.h
index 7cbbccc44..7cbbccc44 100644
--- a/programs/pluto/foodgroups.h
+++ b/src/pluto/foodgroups.h
diff --git a/programs/pluto/gcryptfix.c b/src/pluto/gcryptfix.c
index 1ebacdcf6..1ebacdcf6 100644
--- a/programs/pluto/gcryptfix.c
+++ b/src/pluto/gcryptfix.c
diff --git a/programs/pluto/gcryptfix.h b/src/pluto/gcryptfix.h
index 637ecbc8d..637ecbc8d 100644
--- a/programs/pluto/gcryptfix.h
+++ b/src/pluto/gcryptfix.h
diff --git a/programs/pluto/id.c b/src/pluto/id.c
index 4e306d3a7..4e306d3a7 100644
--- a/programs/pluto/id.c
+++ b/src/pluto/id.c
diff --git a/programs/pluto/id.h b/src/pluto/id.h
index 4fe9ef227..4fe9ef227 100644
--- a/programs/pluto/id.h
+++ b/src/pluto/id.h
diff --git a/programs/pluto/ike_alg.c b/src/pluto/ike_alg.c
index 47393079a..47393079a 100644
--- a/programs/pluto/ike_alg.c
+++ b/src/pluto/ike_alg.c
diff --git a/programs/pluto/ike_alg.h b/src/pluto/ike_alg.h
index a41718c04..a41718c04 100644
--- a/programs/pluto/ike_alg.h
+++ b/src/pluto/ike_alg.h
diff --git a/programs/pluto/ipsec.secrets.5 b/src/pluto/ipsec.secrets.5
index 3cce4d3f8..3cce4d3f8 100644
--- a/programs/pluto/ipsec.secrets.5
+++ b/src/pluto/ipsec.secrets.5
diff --git a/programs/pluto/ipsec_doi.c b/src/pluto/ipsec_doi.c
index fe5c846a7..fe5c846a7 100644
--- a/programs/pluto/ipsec_doi.c
+++ b/src/pluto/ipsec_doi.c
diff --git a/programs/pluto/ipsec_doi.h b/src/pluto/ipsec_doi.h
index 80b12c31d..80b12c31d 100644
--- a/programs/pluto/ipsec_doi.h
+++ b/src/pluto/ipsec_doi.h
diff --git a/programs/pluto/kameipsec.h b/src/pluto/kameipsec.h
index 5f08c7d38..5f08c7d38 100644
--- a/programs/pluto/kameipsec.h
+++ b/src/pluto/kameipsec.h
diff --git a/programs/pluto/kernel.c b/src/pluto/kernel.c
index 5d7c5f78a..5d7c5f78a 100644
--- a/programs/pluto/kernel.c
+++ b/src/pluto/kernel.c
diff --git a/programs/pluto/kernel.h b/src/pluto/kernel.h
index c01ff31f9..c01ff31f9 100644
--- a/programs/pluto/kernel.h
+++ b/src/pluto/kernel.h
diff --git a/programs/pluto/kernel_alg.c b/src/pluto/kernel_alg.c
index 920a879d7..920a879d7 100644
--- a/programs/pluto/kernel_alg.c
+++ b/src/pluto/kernel_alg.c
diff --git a/programs/pluto/kernel_alg.h b/src/pluto/kernel_alg.h
index 483e97da1..483e97da1 100644
--- a/programs/pluto/kernel_alg.h
+++ b/src/pluto/kernel_alg.h
diff --git a/programs/pluto/kernel_netlink.c b/src/pluto/kernel_netlink.c
index fd43c4653..fd43c4653 100644
--- a/programs/pluto/kernel_netlink.c
+++ b/src/pluto/kernel_netlink.c
diff --git a/programs/pluto/kernel_netlink.h b/src/pluto/kernel_netlink.h
index 1b5f42e48..1b5f42e48 100644
--- a/programs/pluto/kernel_netlink.h
+++ b/src/pluto/kernel_netlink.h
diff --git a/programs/pluto/kernel_noklips.c b/src/pluto/kernel_noklips.c
index 570bb0470..570bb0470 100644
--- a/programs/pluto/kernel_noklips.c
+++ b/src/pluto/kernel_noklips.c
diff --git a/programs/pluto/kernel_noklips.h b/src/pluto/kernel_noklips.h
index fe4e77ec4..fe4e77ec4 100644
--- a/programs/pluto/kernel_noklips.h
+++ b/src/pluto/kernel_noklips.h
diff --git a/programs/pluto/kernel_pfkey.c b/src/pluto/kernel_pfkey.c
index 76bfbaf9a..76bfbaf9a 100644
--- a/programs/pluto/kernel_pfkey.c
+++ b/src/pluto/kernel_pfkey.c
diff --git a/programs/pluto/kernel_pfkey.h b/src/pluto/kernel_pfkey.h
index 9dbcdd341..9dbcdd341 100644
--- a/programs/pluto/kernel_pfkey.h
+++ b/src/pluto/kernel_pfkey.h
diff --git a/programs/pluto/keys.c b/src/pluto/keys.c
index 21092383a..21092383a 100644
--- a/programs/pluto/keys.c
+++ b/src/pluto/keys.c
diff --git a/programs/pluto/keys.h b/src/pluto/keys.h
index d47d8b0a2..d47d8b0a2 100644
--- a/programs/pluto/keys.h
+++ b/src/pluto/keys.h
diff --git a/programs/pluto/lex.c b/src/pluto/lex.c
index 5c811725a..5c811725a 100644
--- a/programs/pluto/lex.c
+++ b/src/pluto/lex.c
diff --git a/programs/pluto/lex.h b/src/pluto/lex.h
index fb6c15236..fb6c15236 100644
--- a/programs/pluto/lex.h
+++ b/src/pluto/lex.h
diff --git a/programs/pluto/linux26/netlink.h b/src/pluto/linux26/netlink.h
index 6b0896da6..6b0896da6 100644
--- a/programs/pluto/linux26/netlink.h
+++ b/src/pluto/linux26/netlink.h
diff --git a/programs/pluto/linux26/rtnetlink.h b/src/pluto/linux26/rtnetlink.h
index 341bc1f86..341bc1f86 100644
--- a/programs/pluto/linux26/rtnetlink.h
+++ b/src/pluto/linux26/rtnetlink.h
diff --git a/programs/pluto/linux26/xfrm.h b/src/pluto/linux26/xfrm.h
index 4269ae29b..4269ae29b 100644
--- a/programs/pluto/linux26/xfrm.h
+++ b/src/pluto/linux26/xfrm.h
diff --git a/programs/pluto/log.c b/src/pluto/log.c
index 137e92980..137e92980 100644
--- a/programs/pluto/log.c
+++ b/src/pluto/log.c
diff --git a/programs/pluto/log.h b/src/pluto/log.h
index 0bf8219aa..0bf8219aa 100644
--- a/programs/pluto/log.h
+++ b/src/pluto/log.h
diff --git a/programs/pluto/md2.c b/src/pluto/md2.c
index d6465477d..d6465477d 100644
--- a/programs/pluto/md2.c
+++ b/src/pluto/md2.c
diff --git a/programs/pluto/md2.h b/src/pluto/md2.h
index b3b48dd92..b3b48dd92 100644
--- a/programs/pluto/md2.h
+++ b/src/pluto/md2.h
diff --git a/programs/pluto/md5.c b/src/pluto/md5.c
index 5d75e38a4..5d75e38a4 100644
--- a/programs/pluto/md5.c
+++ b/src/pluto/md5.c
diff --git a/programs/pluto/md5.h b/src/pluto/md5.h
index 9b29bc46e..9b29bc46e 100644
--- a/programs/pluto/md5.h
+++ b/src/pluto/md5.h
diff --git a/programs/pluto/modecfg.c b/src/pluto/modecfg.c
index 1c22845a5..1c22845a5 100644
--- a/programs/pluto/modecfg.c
+++ b/src/pluto/modecfg.c
diff --git a/programs/pluto/modecfg.h b/src/pluto/modecfg.h
index f6856d263..f6856d263 100644
--- a/programs/pluto/modecfg.h
+++ b/src/pluto/modecfg.h
diff --git a/programs/pluto/mp_defs.c b/src/pluto/mp_defs.c
index 7ad896751..7ad896751 100644
--- a/programs/pluto/mp_defs.c
+++ b/src/pluto/mp_defs.c
diff --git a/programs/pluto/mp_defs.h b/src/pluto/mp_defs.h
index 744a028d1..744a028d1 100644
--- a/programs/pluto/mp_defs.h
+++ b/src/pluto/mp_defs.h
diff --git a/programs/pluto/nat_traversal.c b/src/pluto/nat_traversal.c
index 2f5ba3cb4..2f5ba3cb4 100644
--- a/programs/pluto/nat_traversal.c
+++ b/src/pluto/nat_traversal.c
diff --git a/programs/pluto/nat_traversal.h b/src/pluto/nat_traversal.h
index 71222c54c..71222c54c 100644
--- a/programs/pluto/nat_traversal.h
+++ b/src/pluto/nat_traversal.h
diff --git a/programs/pluto/ocsp.c b/src/pluto/ocsp.c
index f31b96c7f..f31b96c7f 100644
--- a/programs/pluto/ocsp.c
+++ b/src/pluto/ocsp.c
diff --git a/programs/pluto/ocsp.h b/src/pluto/ocsp.h
index 49e1026ec..49e1026ec 100644
--- a/programs/pluto/ocsp.h
+++ b/src/pluto/ocsp.h
diff --git a/programs/pluto/oid.c b/src/pluto/oid.c
index 4b0632de2..4b0632de2 100644
--- a/programs/pluto/oid.c
+++ b/src/pluto/oid.c
diff --git a/programs/pluto/oid.h b/src/pluto/oid.h
index 71f8101cd..71f8101cd 100644
--- a/programs/pluto/oid.h
+++ b/src/pluto/oid.h
diff --git a/programs/pluto/oid.pl b/src/pluto/oid.pl
index 52ac8eae0..52ac8eae0 100644
--- a/programs/pluto/oid.pl
+++ b/src/pluto/oid.pl
diff --git a/programs/pluto/oid.txt b/src/pluto/oid.txt
index eed46d59d..eed46d59d 100644
--- a/programs/pluto/oid.txt
+++ b/src/pluto/oid.txt
diff --git a/programs/pluto/packet.c b/src/pluto/packet.c
index 9f04c8bb2..9f04c8bb2 100644
--- a/programs/pluto/packet.c
+++ b/src/pluto/packet.c
diff --git a/programs/pluto/packet.h b/src/pluto/packet.h
index 676a5e6cd..676a5e6cd 100644
--- a/programs/pluto/packet.h
+++ b/src/pluto/packet.h
diff --git a/programs/pluto/pem.c b/src/pluto/pem.c
index e8d381741..e8d381741 100644
--- a/programs/pluto/pem.c
+++ b/src/pluto/pem.c
diff --git a/programs/pluto/pem.h b/src/pluto/pem.h
index 815b5d85b..815b5d85b 100644
--- a/programs/pluto/pem.h
+++ b/src/pluto/pem.h
diff --git a/programs/pluto/pgp.c b/src/pluto/pgp.c
index 015319aaf..015319aaf 100644
--- a/programs/pluto/pgp.c
+++ b/src/pluto/pgp.c
diff --git a/programs/pluto/pgp.h b/src/pluto/pgp.h
index 4f34debc9..4f34debc9 100644
--- a/programs/pluto/pgp.h
+++ b/src/pluto/pgp.h
diff --git a/programs/pluto/pkcs1.c b/src/pluto/pkcs1.c
index 413938976..413938976 100644
--- a/programs/pluto/pkcs1.c
+++ b/src/pluto/pkcs1.c
diff --git a/programs/pluto/pkcs1.h b/src/pluto/pkcs1.h
index c927db0f8..c927db0f8 100644
--- a/programs/pluto/pkcs1.h
+++ b/src/pluto/pkcs1.h
diff --git a/programs/pluto/pkcs7.c b/src/pluto/pkcs7.c
index 0691a80d6..0691a80d6 100644
--- a/programs/pluto/pkcs7.c
+++ b/src/pluto/pkcs7.c
diff --git a/programs/pluto/pkcs7.h b/src/pluto/pkcs7.h
index 38c633f4e..38c633f4e 100644
--- a/programs/pluto/pkcs7.h
+++ b/src/pluto/pkcs7.h
diff --git a/programs/pluto/pluto-style.el b/src/pluto/pluto-style.el
index 0de474e44..0de474e44 100644
--- a/programs/pluto/pluto-style.el
+++ b/src/pluto/pluto-style.el
diff --git a/programs/pluto/pluto.8 b/src/pluto/pluto.8
index b80d13772..b80d13772 100644
--- a/programs/pluto/pluto.8
+++ b/src/pluto/pluto.8
diff --git a/programs/pluto/plutomain.c b/src/pluto/plutomain.c
index f9badbae3..f9badbae3 100644
--- a/programs/pluto/plutomain.c
+++ b/src/pluto/plutomain.c
diff --git a/programs/pluto/primegen.c b/src/pluto/primegen.c
index 159490345..159490345 100644
--- a/programs/pluto/primegen.c
+++ b/src/pluto/primegen.c
diff --git a/programs/pluto/rcv_info.c b/src/pluto/rcv_info.c
index 1f6127830..1f6127830 100644
--- a/programs/pluto/rcv_info.c
+++ b/src/pluto/rcv_info.c
diff --git a/programs/pluto/rcv_info.h b/src/pluto/rcv_info.h
index b5eaef219..b5eaef219 100644
--- a/programs/pluto/rcv_info.h
+++ b/src/pluto/rcv_info.h
diff --git a/programs/pluto/rcv_whack.c b/src/pluto/rcv_whack.c
index 164a4f249..164a4f249 100644
--- a/programs/pluto/rcv_whack.c
+++ b/src/pluto/rcv_whack.c
diff --git a/programs/pluto/rcv_whack.h b/src/pluto/rcv_whack.h
index f42761c51..f42761c51 100644
--- a/programs/pluto/rcv_whack.h
+++ b/src/pluto/rcv_whack.h
diff --git a/programs/pluto/rnd.c b/src/pluto/rnd.c
index da72cc8ff..da72cc8ff 100644
--- a/programs/pluto/rnd.c
+++ b/src/pluto/rnd.c
diff --git a/programs/pluto/rnd.h b/src/pluto/rnd.h
index 0bd168039..0bd168039 100644
--- a/programs/pluto/rnd.h
+++ b/src/pluto/rnd.h
diff --git a/programs/pluto/routing.txt b/src/pluto/routing.txt
index a69b8a542..a69b8a542 100644
--- a/programs/pluto/routing.txt
+++ b/src/pluto/routing.txt
diff --git a/programs/pluto/rsaref/pkcs11.h b/src/pluto/rsaref/pkcs11.h
index 9261e1e4c..9261e1e4c 100644
--- a/programs/pluto/rsaref/pkcs11.h
+++ b/src/pluto/rsaref/pkcs11.h
diff --git a/programs/pluto/rsaref/pkcs11f.h b/src/pluto/rsaref/pkcs11f.h
index dec6315dd..dec6315dd 100644
--- a/programs/pluto/rsaref/pkcs11f.h
+++ b/src/pluto/rsaref/pkcs11f.h
diff --git a/programs/pluto/rsaref/pkcs11t.h b/src/pluto/rsaref/pkcs11t.h
index 3da20b215..3da20b215 100644
--- a/programs/pluto/rsaref/pkcs11t.h
+++ b/src/pluto/rsaref/pkcs11t.h
diff --git a/programs/pluto/rsaref/unix.h b/src/pluto/rsaref/unix.h
index 2e7eb6663..2e7eb6663 100644
--- a/programs/pluto/rsaref/unix.h
+++ b/src/pluto/rsaref/unix.h
diff --git a/programs/pluto/server.c b/src/pluto/server.c
index 30251138e..30251138e 100644
--- a/programs/pluto/server.c
+++ b/src/pluto/server.c
diff --git a/programs/pluto/server.h b/src/pluto/server.h
index aa14d5aaa..aa14d5aaa 100644
--- a/programs/pluto/server.h
+++ b/src/pluto/server.h
diff --git a/programs/pluto/sha1.c b/src/pluto/sha1.c
index bbf062876..bbf062876 100644
--- a/programs/pluto/sha1.c
+++ b/src/pluto/sha1.c
diff --git a/programs/pluto/sha1.h b/src/pluto/sha1.h
index 64b3d2f5d..64b3d2f5d 100644
--- a/programs/pluto/sha1.h
+++ b/src/pluto/sha1.h
diff --git a/programs/pluto/smallprime.c b/src/pluto/smallprime.c
index 87497d096..87497d096 100644
--- a/programs/pluto/smallprime.c
+++ b/src/pluto/smallprime.c
diff --git a/programs/pluto/smartcard.c b/src/pluto/smartcard.c
index f1994f1cf..f1994f1cf 100644
--- a/programs/pluto/smartcard.c
+++ b/src/pluto/smartcard.c
diff --git a/programs/pluto/smartcard.h b/src/pluto/smartcard.h
index c004ca7dd..c004ca7dd 100644
--- a/programs/pluto/smartcard.h
+++ b/src/pluto/smartcard.h
diff --git a/programs/pluto/spdb.c b/src/pluto/spdb.c
index 0544a1da2..0544a1da2 100644
--- a/programs/pluto/spdb.c
+++ b/src/pluto/spdb.c
diff --git a/programs/pluto/spdb.h b/src/pluto/spdb.h
index 5eebf86cf..5eebf86cf 100644
--- a/programs/pluto/spdb.h
+++ b/src/pluto/spdb.h
diff --git a/programs/pluto/state.c b/src/pluto/state.c
index 5957654e3..5957654e3 100644
--- a/programs/pluto/state.c
+++ b/src/pluto/state.c
diff --git a/programs/pluto/state.h b/src/pluto/state.h
index 2f30d77f1..2f30d77f1 100644
--- a/programs/pluto/state.h
+++ b/src/pluto/state.h
diff --git a/programs/pluto/timer.c b/src/pluto/timer.c
index 4d9ef8fab..4d9ef8fab 100644
--- a/programs/pluto/timer.c
+++ b/src/pluto/timer.c
diff --git a/programs/pluto/timer.h b/src/pluto/timer.h
index 92464192c..92464192c 100644
--- a/programs/pluto/timer.h
+++ b/src/pluto/timer.h
diff --git a/programs/pluto/vendor.c b/src/pluto/vendor.c
index 51931c239..51931c239 100644
--- a/programs/pluto/vendor.c
+++ b/src/pluto/vendor.c
diff --git a/programs/pluto/vendor.h b/src/pluto/vendor.h
index d6b414be2..d6b414be2 100644
--- a/programs/pluto/vendor.h
+++ b/src/pluto/vendor.h
diff --git a/programs/pluto/virtual.c b/src/pluto/virtual.c
index 58487c1e8..58487c1e8 100644
--- a/programs/pluto/virtual.c
+++ b/src/pluto/virtual.c
diff --git a/programs/pluto/virtual.h b/src/pluto/virtual.h
index 2d5bf27ae..2d5bf27ae 100644
--- a/programs/pluto/virtual.h
+++ b/src/pluto/virtual.h
diff --git a/programs/pluto/whack.c b/src/pluto/whack.c
index a3b983771..a3b983771 100644
--- a/programs/pluto/whack.c
+++ b/src/pluto/whack.c
diff --git a/programs/pluto/whack.h b/src/pluto/whack.h
index 3086f1543..3086f1543 100644
--- a/programs/pluto/whack.h
+++ b/src/pluto/whack.h
diff --git a/programs/pluto/x509.c b/src/pluto/x509.c
index c1b4cb6e3..c1b4cb6e3 100644
--- a/programs/pluto/x509.c
+++ b/src/pluto/x509.c
diff --git a/programs/pluto/x509.h b/src/pluto/x509.h
index d15b3da53..d15b3da53 100644
--- a/programs/pluto/x509.h
+++ b/src/pluto/x509.h
diff --git a/programs/scepclient/Makefile b/src/scepclient/Makefile
index dec36c888..dec36c888 100644
--- a/programs/scepclient/Makefile
+++ b/src/scepclient/Makefile
diff --git a/programs/scepclient/pkcs10.c b/src/scepclient/pkcs10.c
index de3f06e18..de3f06e18 100644
--- a/programs/scepclient/pkcs10.c
+++ b/src/scepclient/pkcs10.c
diff --git a/programs/scepclient/pkcs10.h b/src/scepclient/pkcs10.h
index c2a4c1b92..c2a4c1b92 100644
--- a/programs/scepclient/pkcs10.h
+++ b/src/scepclient/pkcs10.h
diff --git a/programs/scepclient/rsakey.c b/src/scepclient/rsakey.c
index c4f26b286..c4f26b286 100644
--- a/programs/scepclient/rsakey.c
+++ b/src/scepclient/rsakey.c
diff --git a/programs/scepclient/rsakey.h b/src/scepclient/rsakey.h
index 3e3156d81..3e3156d81 100644
--- a/programs/scepclient/rsakey.h
+++ b/src/scepclient/rsakey.h
diff --git a/programs/scepclient/scep.c b/src/scepclient/scep.c
index 577191787..577191787 100644
--- a/programs/scepclient/scep.c
+++ b/src/scepclient/scep.c
diff --git a/programs/scepclient/scep.h b/src/scepclient/scep.h
index 81e5d1a4b..81e5d1a4b 100644
--- a/programs/scepclient/scep.h
+++ b/src/scepclient/scep.h
diff --git a/programs/scepclient/scepclient.8 b/src/scepclient/scepclient.8
index 0d6364ef2..0d6364ef2 100644
--- a/programs/scepclient/scepclient.8
+++ b/src/scepclient/scepclient.8
diff --git a/programs/scepclient/scepclient.c b/src/scepclient/scepclient.c
index bde460844..bde460844 100644
--- a/programs/scepclient/scepclient.c
+++ b/src/scepclient/scepclient.c
diff --git a/programs/starter/Makefile b/src/starter/Makefile
index 0aeceb60f..0aeceb60f 100644
--- a/programs/starter/Makefile
+++ b/src/starter/Makefile
diff --git a/programs/starter/README b/src/starter/README
index 12a60a11d..12a60a11d 100644
--- a/programs/starter/README
+++ b/src/starter/README
diff --git a/programs/starter/args.c b/src/starter/args.c
index 56b286beb..56b286beb 100644
--- a/programs/starter/args.c
+++ b/src/starter/args.c
diff --git a/programs/starter/args.h b/src/starter/args.h
index 302e9bb7b..302e9bb7b 100644
--- a/programs/starter/args.h
+++ b/src/starter/args.h
diff --git a/programs/starter/cmp.c b/src/starter/cmp.c
index 9222bf58f..9222bf58f 100644
--- a/programs/starter/cmp.c
+++ b/src/starter/cmp.c
diff --git a/programs/starter/cmp.h b/src/starter/cmp.h
index ca355e9eb..ca355e9eb 100644
--- a/programs/starter/cmp.h
+++ b/src/starter/cmp.h
diff --git a/programs/starter/confread.c b/src/starter/confread.c
index cf12d05ca..cf12d05ca 100644
--- a/programs/starter/confread.c
+++ b/src/starter/confread.c
diff --git a/programs/starter/confread.h b/src/starter/confread.h
index a3b1b7379..a3b1b7379 100644
--- a/programs/starter/confread.h
+++ b/src/starter/confread.h
diff --git a/programs/starter/exec.c b/src/starter/exec.c
index 98541db75..98541db75 100644
--- a/programs/starter/exec.c
+++ b/src/starter/exec.c
diff --git a/programs/starter/exec.h b/src/starter/exec.h
index d4be931dd..d4be931dd 100644
--- a/programs/starter/exec.h
+++ b/src/starter/exec.h
diff --git a/programs/starter/files.h b/src/starter/files.h
index 83d27e152..83d27e152 100644
--- a/programs/starter/files.h
+++ b/src/starter/files.h
diff --git a/programs/starter/interfaces.c b/src/starter/interfaces.c
index 9926ea059..9926ea059 100644
--- a/programs/starter/interfaces.c
+++ b/src/starter/interfaces.c
diff --git a/programs/starter/interfaces.h b/src/starter/interfaces.h
index 9898c0516..9898c0516 100644
--- a/programs/starter/interfaces.h
+++ b/src/starter/interfaces.h
diff --git a/programs/starter/invokecharon.c b/src/starter/invokecharon.c
index a56a03ba8..a56a03ba8 100644
--- a/programs/starter/invokecharon.c
+++ b/src/starter/invokecharon.c
diff --git a/programs/starter/invokecharon.h b/src/starter/invokecharon.h
index b18dba362..b18dba362 100644
--- a/programs/starter/invokecharon.h
+++ b/src/starter/invokecharon.h
diff --git a/programs/starter/invokepluto.c b/src/starter/invokepluto.c
index c7e047329..c7e047329 100644
--- a/programs/starter/invokepluto.c
+++ b/src/starter/invokepluto.c
diff --git a/programs/starter/invokepluto.h b/src/starter/invokepluto.h
index 26858f9b2..26858f9b2 100644
--- a/programs/starter/invokepluto.h
+++ b/src/starter/invokepluto.h
diff --git a/programs/starter/keywords.c b/src/starter/keywords.c
index 4cc5c03e8..4cc5c03e8 100644
--- a/programs/starter/keywords.c
+++ b/src/starter/keywords.c
diff --git a/programs/starter/keywords.h b/src/starter/keywords.h
index 6542ae1be..6542ae1be 100644
--- a/programs/starter/keywords.h
+++ b/src/starter/keywords.h
diff --git a/programs/starter/keywords.txt b/src/starter/keywords.txt
index dcfdafc98..dcfdafc98 100644
--- a/programs/starter/keywords.txt
+++ b/src/starter/keywords.txt
diff --git a/programs/starter/lex.yy.c b/src/starter/lex.yy.c
index 20d2edb08..20d2edb08 100644
--- a/programs/starter/lex.yy.c
+++ b/src/starter/lex.yy.c
diff --git a/programs/starter/netkey.c b/src/starter/netkey.c
index d0b8e0a2c..d0b8e0a2c 100644
--- a/programs/starter/netkey.c
+++ b/src/starter/netkey.c
diff --git a/programs/starter/netkey.h b/src/starter/netkey.h
index ff8989d34..ff8989d34 100644
--- a/programs/starter/netkey.h
+++ b/src/starter/netkey.h
diff --git a/programs/starter/parser.h b/src/starter/parser.h
index 61bdea974..61bdea974 100644
--- a/programs/starter/parser.h
+++ b/src/starter/parser.h
diff --git a/programs/starter/parser.l b/src/starter/parser.l
index 8d1cc4c31..8d1cc4c31 100644
--- a/programs/starter/parser.l
+++ b/src/starter/parser.l
diff --git a/programs/starter/parser.output b/src/starter/parser.output
index ddb01e89a..ddb01e89a 100644
--- a/programs/starter/parser.output
+++ b/src/starter/parser.output
diff --git a/programs/starter/parser.tab.c b/src/starter/parser.tab.c
index 7b2349e76..7b2349e76 100644
--- a/programs/starter/parser.tab.c
+++ b/src/starter/parser.tab.c
diff --git a/programs/starter/parser.tab.h b/src/starter/parser.tab.h
index 1ded28fdb..1ded28fdb 100644
--- a/programs/starter/parser.tab.h
+++ b/src/starter/parser.tab.h
diff --git a/programs/starter/parser.y b/src/starter/parser.y
index 159bbc651..159bbc651 100644
--- a/programs/starter/parser.y
+++ b/src/starter/parser.y
diff --git a/programs/starter/starter.8 b/src/starter/starter.8
index e69de29bb..e69de29bb 100644
--- a/programs/starter/starter.8
+++ b/src/starter/starter.8
diff --git a/programs/starter/starter.c b/src/starter/starter.c
index 4b4e23fb3..4b4e23fb3 100644
--- a/programs/starter/starter.c
+++ b/src/starter/starter.c
diff --git a/programs/starter/starterstroke.c b/src/starter/starterstroke.c
index 115741404..115741404 100644
--- a/programs/starter/starterstroke.c
+++ b/src/starter/starterstroke.c
diff --git a/programs/starter/starterstroke.h b/src/starter/starterstroke.h
index 10fc8b84f..10fc8b84f 100644
--- a/programs/starter/starterstroke.h
+++ b/src/starter/starterstroke.h
diff --git a/programs/starter/starterwhack.c b/src/starter/starterwhack.c
index a42d91991..a42d91991 100644
--- a/programs/starter/starterwhack.c
+++ b/src/starter/starterwhack.c
diff --git a/programs/starter/starterwhack.h b/src/starter/starterwhack.h
index 2e79c0715..2e79c0715 100644
--- a/programs/starter/starterwhack.h
+++ b/src/starter/starterwhack.h