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

[Paul Wouters]

New commits:
commit 5c01d2d48583c0818293fddabbcb33785bd3c5be
Merge: 9d6c0b9 9fb587f
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Dec 7 20:06:56 2013 -0500

    Merge branch 'master' of vault.libreswan.org:/srv/src/libreswan

commit 9d6c0b9d66854d7df85fe306a8de16847a6a1ced
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Dec 7 20:05:36 2013 -0500

    KLIPS: Always enable null encryption (like NETKEY/XFRM)
    
    Removed define CONFIG_KLIPS_ENC_NULL
    
    This code still seems to fail with:
    
    [ 4188.227000] KLIPS: lookup for ciphername=cipher_null: not found
    
    The code in kernel_netlink.c suggests it is the correct name.

commit 55f6b9c195fa7f0d266c4ebf950bc4a5171daaaf
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Dec 7 20:05:15 2013 -0500

    KLIPS: enable cryptoapi in default compile