aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Version bump to 5.5.0dr15.5.0dr1Andreas Steffen2016-06-262-1/+9
* Merge branch 'tpm2'Andreas Steffen2016-06-2643-1004/+3198
|\
| * libtpmtss: Added to integrity checksAndreas Steffen2016-06-264-0/+19
| * aikpub2: Output AIK signature algorithmAndreas Steffen2016-06-261-1/+14
| * Refactoring to tpm_tss_quote_info objectAndreas Steffen2016-06-2624-397/+923
| * libimcv: Changed debug level for functional components from 2 to 3Andreas Steffen2016-06-261-2/+2
| * libtpmtss: Implemented TSS2 quote() methodAndreas Steffen2016-06-262-23/+142
| * libtpmtss: Implemented TSS2 read_pcr() methodAndreas Steffen2016-06-221-6/+114
| * libimcv: migrate pts to tpm_tssAndreas Steffen2016-06-2212-496/+572
| * libtpmtss: Get TPM 2.0 capabilitiesAndreas Steffen2016-06-224-2/+227
| * libtpmtss: Retrieve TPM 1.2 version infoAndreas Steffen2016-06-223-3/+75
| * Created libtpmtss library handling access to v1.2 and v2.0 TPMsAndreas Steffen2016-06-2215-403/+927
| * aikpub2: --handle option retrieves public key from TPM 2.0 NVRAMAndreas Steffen2016-06-222-30/+147
| * aikpub2: Convert TSS 2.0 AIK public key blob into PKCS#1 formatAndreas Steffen2016-06-227-5/+400
|/
* testing: Start charon before Apache in tnc/tnccs-20-pdp-pt-tlsTobias Brunner2016-06-211-1/+1
* testing: Only load selected plugins in swanctlTobias Brunner2016-06-201-0/+4
* Merge branch 'exchange-collisions'Tobias Brunner2016-06-1754-329/+6479
|\
| * unit-tests: Add tests for expires after CHILD_SA rekeyingTobias Brunner2016-06-171-0/+129
| * child-rekey: Only rekey installed CHILD_SAsTobias Brunner2016-06-171-7/+14
| * Report test coverage of libcharon and starterTobias Brunner2016-06-172-0/+6
| * unit-tests: Add test for CHILD_SA rekey if a retry due to an INVALID_KE_PAYLO...Tobias Brunner2016-06-171-0/+143
| * child-rekey: Ignore failed colliding CHILD_SA rekeyingsTobias Brunner2016-06-171-1/+10
| * unit-tests: Add test for collision between IKE_SA rekey and CHILD_SA creationTobias Brunner2016-06-173-0/+108
| * child-create: Retry creating the CHILD_SA if TEMPORARY_FAILURE is receivedTobias Brunner2016-06-171-4/+33
| * ikev2: Add possibility to delay initiation of a queued taskTobias Brunner2016-06-175-66/+189
| * ike: Reduce RETRY_INTERVAL a bitTobias Brunner2016-06-171-2/+2
| * ike-rekey: Return TEMPORARY_FAILURE when concurrently creating a CHILD_SATobias Brunner2016-06-171-14/+35
| * unit-tests: Add tests for IKE rekeying if INVALID_KE_PAYLOAD notifies are rec...Tobias Brunner2016-06-171-0/+470
| * ike: Add configuration option to switch to preferring supplied proposals over...Tobias Brunner2016-06-176-10/+26
| * child-cfg: Add option to prefer supplied proposals over locally configured onesTobias Brunner2016-06-174-23/+38
| * ike-cfg: Add option to prefer supplied proposals over locally configured onesTobias Brunner2016-06-175-32/+48
| * proposal: Remove MODP_NONE from IKE proposals parsed from stringsTobias Brunner2016-06-171-0/+10
| * proposal: Handle MODP_NONE in both directions when selecting proposalsTobias Brunner2016-06-174-6/+97
| * proposal: Parse modpnone as MODP_NONE(0)Tobias Brunner2016-06-171-0/+1
| * ike-rekey: Make sure to ignore task when detecting collisions if ike-init sub...Tobias Brunner2016-06-171-1/+2
| * unit-tests: Add test for rekey collision if one CREATE_CHILD_SA response is d...Tobias Brunner2016-06-171-0/+221
| * unit-tests: Add tests for IKE_SA rekeying if collision is not detected by one...Tobias Brunner2016-06-171-0/+340
| * ike-rekey: Handle undetected collisions also if delete is delayedTobias Brunner2016-06-171-16/+26
| * ike-rekey: There is no passive reauth task, so it will never collide with oneTobias Brunner2016-06-172-7/+4
| * ike-rekey: Ignore colliding rekey tasks that did not create an IKE_SATobias Brunner2016-06-171-56/+64
| * ike-rekey: Properly handle situation if the peer did not notice the rekey col...Tobias Brunner2016-06-171-0/+11
| * ike-delete: Handle deletes while rekeying differently if there was a collisionTobias Brunner2016-06-171-2/+40
| * ike-rekey: Add method to check if there was a rekey collisionTobias Brunner2016-06-172-1/+17
| * ikev2: Check for collisions after handling IKE deletionTobias Brunner2016-06-171-1/+5
| * unit-tests: Add tests for IKE/CHILD delete collisionsTobias Brunner2016-06-171-0/+165
| * child-delete: Reply as usual when concurrently rekeying the IKE_SATobias Brunner2016-06-171-5/+1
| * unit-tests: Add tests for IKE/CHILD rekey collisionsTobias Brunner2016-06-171-0/+170
| * child-create: Respond with TEMPORARY_FAILURE while rekeying/deleting IKE_SATobias Brunner2016-06-171-2/+2
| * ike-rekey: Respond with TEMPORARY_FAILURE if CHILD_SAs are currently rekeyed/...Tobias Brunner2016-06-171-1/+8
| * unit-tests: Add tests for collisions between IKE_SA rekeying and deletionTobias Brunner2016-06-171-0/+174