From cdffc716c9afac6591c7831804f07a531a75d36b Mon Sep 17 00:00:00 2001
From: Ben Laurie <ben@openssl.org>
Date: Tue, 14 Oct 2008 19:21:30 +0000
Subject: [PATCH] Set the comparison function in v3_addr_canonize().

---
 CHANGES                 | 3 +++
 crypto/x509v3/v3_addr.c | 1 +
 2 files changed, 4 insertions(+)

diff --git a/CHANGES b/CHANGES
index b0d4012d3b..ceff533edc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,9 @@
 
  Changes between 0.9.8i and 0.9.8j  [xx XXX xxxx]
 
+  *) Set the comparison function in v3_addr_canonize().
+     [Rob Austein <sra@hactrn.net>]
+
   *) Add support for XMPP STARTTLS in s_client.
      [Philip Paeps <philip@freebsd.org>]
 
diff --git a/crypto/x509v3/v3_addr.c b/crypto/x509v3/v3_addr.c
index c6730ab3fd..63f4785325 100644
--- a/crypto/x509v3/v3_addr.c
+++ b/crypto/x509v3/v3_addr.c
@@ -878,6 +878,7 @@ int v3_addr_canonize(IPAddrBlocks *addr)
 				    v3_addr_get_afi(f)))
       return 0;
   }
+  sk_IPAddressFamily_set_cmp_func(addr, IPAddressFamily_cmp);
   sk_IPAddressFamily_sort(addr);
   assert(v3_addr_is_canonical(addr));
   return 1;
-- 
2.25.1