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

[Paul Wouters]

New commits:
commit f58b43e2c3b4089445992d93e46407b8bd84339b
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Apr 5 01:26:24 2014 -0400

    pluto: Removal of ipsec_policy.h, cleanup of IDtype and CERTtype registries
    
    ipsec_policy.h contained mostly references to removed "policy socket" code.
    
    This was an old attempt to convey OE IPsec status to applications using a kind
    of "limited" (readonly) pluto whack socket. Code for this support was already
    removed. This was all pretty misleading, because for some strange reason the
    filename picked was "ipsec_policy.h" but it had nothing to do with IPsec
    policy - it was the "policy socket".
    
    This patch removes ipsec_policy.h. It moves the AH_ and ESP_ defines
    back to the proper ietf_constants.h / constants.c files. A few files
    in lib/ that have not gone back into programs/pluto used to include
    ipsec_policy.h. These could include ietf_constants.h instead because
    ietf_constants.h was not protected against double includes - so this
    protection was added to ietf_constants.h
    
    The enum ipsec_cert_type was renamed to ike_cert_type.
    The enum ipsec_id_type was renamed to ike_id_type.
    These enums contains both IKEv1 and IKEv2 entries. There is no (real) conflict.
    (splitting these is very inconvenient, due to some code (eg ipsec_doi.c) not
     having any idea if it was called from ikev1 or ikev2)