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

[Paul Wouters]

New commits:
commit 0dd81b7639888101d47413bc8949e7e71a1c97d7
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Mar 25 10:35:07 2014 -0400

    sanitize_string returned the length, but all uses were cast to void
    
    So I changed it to just return void.

commit 2a979f62b78e5a7566dcaf22d31c85ac0a8d7d98
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Mar 24 21:48:05 2014 -0400

    whacklab: remove obsolete usleeps and fix error message

commit ebaf8c99661873468efa22fa08c33570c6f5f979
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Mar 24 21:47:14 2014 -0400

    testing: libvirt's virt-manager no longer creates images properly
    
    So we dd an image for it (and ensure it is accessable by qemu)

commit e9c6676d243c68170b0ff54113cfe12a44b034e3
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Mar 24 16:22:25 2014 -0400

    IANA update for modp groups and fix printing modp group in phase1
    
    We used to print:
    
    24 21:29:12 foo-gw pluto[7013]: "foobar-espoo4/2x0" #1715: STATE_MAIN_R3: sent MR3, ISAKMP SA established {auth=OAKLEY_RSA_SIG cipher=aes_256 prf=OAKLEY_SHA2_256 group=modp2048}
    
    note modp2048 is wrong, as this is using DH24
    
    It now prints:
    
    004 "redhat" #1: STATE_AGGR_I2: sent AI2, ISAKMP SA established {auth=PRESHARED_KEY cipher=aes_128 prf=sha group=MODP1024}
    
    using proper group names and with a stripped OAKLEY prefix.