New commits: commit ec941017943560c9f22f3e9b201081eb1d50b37d Merge: b8ab6bc 1d643b5 Author: D. Hugh Redelmeier <h...@mimosa.com> Date: Sat Apr 12 22:07:00 2014 -0400
Merge branch 'master' into crypt-helper-simplify Conflicts: programs/pluto/ikev2_parent.c commit b8ab6bca5ffc5197c187336e224540d1242e25cd Author: D. Hugh Redelmeier <h...@mimosa.com> Date: Sat Apr 12 21:46:36 2014 -0400 Improve v2's setting of cur_state. More work needed. commit 9f32986f3c979e304ee58a4bce0b034059f58da2 Author: D. Hugh Redelmeier <h...@mimosa.com> Date: Thu Apr 3 12:28:30 2014 -0400 More work on crypto helper code. - move struct qke_continuation definition from ikev1_continuations.h to pluto_crypt.h (where its brothers live). - remove unnecessary #include "timer.h" from some files - add prefix to names of fields in structs specializing struct pluto_crypto_req_cont - (transitional) make sure that pcrc_serialno is set before calls to Make sure that saved reference to state object is consistent. These redundancies should be eliminated by refactoring. - change quick_inI1_outR1_cryptotail so quick_inI1_outR1_cryptocontinue1 didn't have to fake a struct dh_continuation. - improve descriptions in pluto_cryptoop_strings - systematically refer to crypto helpers in logging: "crypto helper %d" Also crypto backlog queue and crypto request IDs. Fix some format typing too. - share code for two STF_SUSPEND cases in send_crypto_helper_request (fixing a bug with timer events). - added some explanatory comments. commit 05b44efc56024633ef83db32cc79f9e632189844 Merge: 2eb1efe a467000 Author: D. Hugh Redelmeier <h...@mimosa.com> Date: Wed Mar 26 01:53:21 2014 -0400 Merge branch 'master' into crypt-helper-simplify Catch crypt-helper-simplify up to master commit 2eb1efeae93436e022e210f30f0d8ae579818867 Author: D. Hugh Redelmeier <h...@mimosa.com> Date: Tue Mar 18 17:57:58 2014 -0400 Advance pluto crypto helper code. - Change send_crypto_helper_request to eliminate boilerplate in callers. - simplify send_crypto_helper_request - Clarify ownership of struct pluto_crypto_req_cont object passed in. This might avoid leaks or double-freeing. More auditing would be wise. - Removed struct pluto_crypto_worker's field "pcw_reaped" because it was alwaysFALSE. Simplified scattered code that referenced this. cleanup_crypto_helper is deleted. - eliminated the abuse of struct pluto_crypto_worker's pcw_pid: it is now correctly declared pthread_t and used as such (an opaque type). - simplify several functions. _______________________________________________ Swan-commit mailing list Swan-commit@lists.libreswan.org https://lists.libreswan.org/mailman/listinfo/swan-commit