diff options
| author | Rong-En Fan <rafan@FreeBSD.org> | 2008-04-13 13:09:32 +0000 |
|---|---|---|
| committer | Rong-En Fan <rafan@FreeBSD.org> | 2008-04-13 13:09:32 +0000 |
| commit | 07b3671f739aaa7ea182a11241cded9323dbaf08 (patch) | |
| tree | d9f1db05be56e0fe5db034ef1c64343c75e3fd00 /security/isakmpd/files | |
| parent | d29680803f7a37bbb18d9231181ae877cb37a0cf (diff) | |
Notes
Diffstat (limited to 'security/isakmpd/files')
| -rw-r--r-- | security/isakmpd/files/patch-pf_key_v2.c | 34 | ||||
| -rw-r--r-- | security/isakmpd/files/patch-x509.c | 17 |
2 files changed, 51 insertions, 0 deletions
diff --git a/security/isakmpd/files/patch-pf_key_v2.c b/security/isakmpd/files/patch-pf_key_v2.c new file mode 100644 index 000000000000..605175707e31 --- /dev/null +++ b/security/isakmpd/files/patch-pf_key_v2.c @@ -0,0 +1,34 @@ +--- pf_key_v2.c.orig 2004-12-08 04:07:00.000000000 +0800 ++++ pf_key_v2.c 2008-04-13 21:00:05.000000000 +0800 +@@ -2204,13 +2204,13 @@ + goto cleanup; + addr->sadb_address_exttype = SADB_EXT_ADDRESS_SRC; + addr->sadb_address_len = len / PF_KEY_V2_CHUNK; +-#ifdef LINUX_IPSEC ++#if defined(LINUX_IPSEC) || defined (__FreeBSD__) + addr->sadb_address_proto = tproto; + #else + addr->sadb_address_proto = IPSEC_ULPROTO_ANY; + #endif + addr->sadb_address_reserved = 0; +-#ifdef LINUX_IPSEC ++#if defined(LINUX_IPSEC) || defined (__FreeBSD__) + pf_key_v2_setup_sockaddr(addr + 1, laddr, 0, sport, 0); + #else + pf_key_v2_setup_sockaddr(addr + 1, laddr, 0, IPSEC_PORT_ANY, 0); +@@ -2238,13 +2238,13 @@ + goto cleanup; + addr->sadb_address_exttype = SADB_EXT_ADDRESS_DST; + addr->sadb_address_len = len / PF_KEY_V2_CHUNK; +-#ifdef LINUX_IPSEC ++#if defined(LINUX_IPSEC) || defined (__FreeBSD__) + addr->sadb_address_proto = tproto; + #else + addr->sadb_address_proto = IPSEC_ULPROTO_ANY; + #endif + addr->sadb_address_reserved = 0; +-#ifdef LINUX_IPSEC ++#if defined(LINUX_IPSEC) || defined (__FreeBSD__) + pf_key_v2_setup_sockaddr(addr + 1, raddr, 0, dport, 0); + #else + pf_key_v2_setup_sockaddr(addr + 1, raddr, 0, IPSEC_PORT_ANY, 0); diff --git a/security/isakmpd/files/patch-x509.c b/security/isakmpd/files/patch-x509.c new file mode 100644 index 000000000000..8e1837d394b2 --- /dev/null +++ b/security/isakmpd/files/patch-x509.c @@ -0,0 +1,17 @@ +--- x509.c.orig 2004-08-11 03:21:01.000000000 +0800 ++++ x509.c 2008-04-13 21:00:05.000000000 +0800 +@@ -910,7 +910,13 @@ + X509_STORE_CTX_init(&csc, x509_cas, cert, NULL); + #if OPENSSL_VERSION_NUMBER >= 0x00907000L + /* XXX See comment in x509_read_crls_from_dir. */ +- if (x509_cas->flags & X509_V_FLAG_CRL_CHECK) { ++ if ( ++#if OPENSSL_VERSION_NUMBER >= 0x00908020L ++ x509_cas->param->flags ++#else ++ x509_cas->flags ++#endif ++ & X509_V_FLAG_CRL_CHECK) { + X509_STORE_CTX_set_flags(&csc, X509_V_FLAG_CRL_CHECK); + X509_STORE_CTX_set_flags(&csc, X509_V_FLAG_CRL_CHECK_ALL); + } |