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

[Paul Wouters]

New commits:
commit 82325a51d3fac60f00a5f1c88be1e482c133abe1
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Aug 28 22:51:06 2014 -0400

    Revert "ietf_constants: fix ESP_CAMELLIA and ESP_NULL_AUTH_AES_GMAC"
    
    This reverts commit 2656a7ce7fce6bc0adbe934cf019105b274ce2a8.
    
    The ESP_* entries for IKEv1 and IKEv2 no longer match :(
    
    In IKEv1, 21 is SEED, 22 CAMELLIA, 23 is NULL_AUTH_AES-GMAC.
    In IKEv2, 21 is NULL_AUTH_AES_GMAC, 22 is reserved, 23 is CAMELLIA (CBC)
       and 24 is CAMELLIA_CTR.
    
    for our esp= line, we match our defined ESP_XXX entries, so this is
    now a problem.