merged multi-auth branch back into trunk

This commit is contained in:
Martin Willi committed 2009-04-14 10:34:24 +00:00
1 parent 6e5c8d9413
commit a44bb9345f
230 files changed
+6163 -4193

No files matched your search

@@ -2,4 +2,5 @@
charon {
load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink updown
multiple_authentication = no
}
@@ -2,4 +2,5 @@
charon {
load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink updown
multiple_authentication = no
}