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

[Andrew Cagney]

New commits:
commit 1b27f9fa0dc1824ff562d735dbcf479830bd7f69
Merge: 5ae1bcc 589fe19
Author: Andrew Cagney <cagney at gnu.org>
Date:   Mon Jul 10 12:16:28 2017 -0400

    parser: cleanup/merge struct ike_info and struct esp_info into struct proposal_info
    
    where 'proposal' is what IKEv2 calls a collection of potential algorithms
    exchanged with the remote when negotiating the crypto-suite for an SA.
    
    The esp/ah only fields .transid and .auth get a simple rename.
    The correct fix - replacing references with struct ike_info's
    .common.name - causes output churn so is left for later.
    
    Merge commit '589fe19ca199e62c39841d096958837411b1bc2d'

commit 589fe19ca199e62c39841d096958837411b1bc2d
Author: Andrew Cagney <cagney at gnu.org>
Date:   Fri Jun 16 22:02:34 2017 -0400

    parser: merge struct esp_info and struct ike_info into struct proposal_info

commit 37445ee9b00fb4ff5f9f1cb5c8b260af01b777c3
Author: Andrew Cagney <cagney at gnu.org>
Date:   Fri Jun 16 21:11:49 2017 -0400

    kernel_alg: struct kernel_alg_info .enckeylen -> .enckeysize
    
    Avoid confusion between this byte-sized value and the parser's
    bit-sized .enckeylen field.

commit c0b639f8fecd3a58c5f7d786b0121e6350214b71
Author: Andrew Cagney <cagney at gnu.org>
Date:   Fri Jun 16 20:44:46 2017 -0400

    parser: clean up struct ike_info's field names
    
    drop .ike_ prefix so names are consistent with esp_info:
    
    .ike_encrypt->.encrypt
    .ike_prf->.prf
    .ike_integ->.integ
    .ike_dh_group->.dh
    .ike_eklen->.enckeylen

commit e85e373080290b0d93f090413152d1680f5ddebf
Author: Andrew Cagney <cagney at gnu.org>
Date:   Fri Jun 16 20:24:27 2017 -0400

    parser: clean up struct esp_info field names
    
    drop .esp_ prefix so esp_info and ike_info are consistent:
    
    .esp_encrypt->.encrypt
    .esp_integ->.integ
    
    add ikev1esp_ prefixes so that it is obvious where an IKEv1 ESP
    value is still being used:
    
    .auth->.ikev1esp_auth
    .transid->.ikev1esp_transid