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

[Paul Wouters]

New commits:
commit 02a5c7ba549f6e505bf7934e5095d19e31481042
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Mar 27 19:51:24 2014 -0400

    pluto: Rename some ikev1 versioned functions, and x509keys.c
    
    x509keys.c is now called x509more.c to match its header file.
    
    Renamed functions:
    
    decode_peer_id -> ikev1_decode_peer_id
    decode_cr -> ikev1_decode_cr
    build_and_ship_CR -> ikev1_build_and_ship_CR
    
    (ikev1_)decode_peer_id() was also moved from ipsec_doi.c to ikev1.c

commit fa1b4dc5130160b803538558864e448da345cd2c
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Mar 27 19:50:29 2014 -0400

    ikev2_x509: Use ikev2_build_and_ship_CR(), not (ikev1_)build_and_ship_CR()