[Swan-commit] Changes to ref refs/heads/master

[Andrew Cagney]

New commits:
commit 6620285d6cfde99c1927be0ee9989587d5ba33e6
Merge: 87558e1 81e9a5b
Author: Andrew Cagney <cagney at gnu.org>
Date:   Fri Aug 11 10:39:39 2017 -0400

    parser: ensure that 'struct proposal_info .integ' is never NULL
    
    Which means that 'struct proposal_info .ikev2esp_auth' is
    equivalent to .integ->common.id[IKEv1_ESP_ID].
    
    Merge commit '81e9a5b90a4740445be2241a15f611ccfe60abf8'

commit 81e9a5b90a4740445be2241a15f611ccfe60abf8
Author: Andrew Cagney <cagney at gnu.org>
Date:   Thu Aug 10 15:04:55 2017 -0400

    parser: when null integrity, set 'struct proposal_info .integ' to &ike_alg_integ_null (not NULL)
    
    So that pluto can assume that 'struct proposal_info .integ' is always
    non-NULL and being otherwise is a problem.
    
    Update IKEv2 code (IKEv1 doesn't do AEAD so not relevant).

commit 69e4cb5dc70c56511c225f2192b543f2ba514bd4
Author: Andrew Cagney <cagney at gnu.org>
Date:   Thu Aug 10 16:11:32 2017 -0400

    testing: expect "null" integrity to appear in algparse output