Set the comparison function in v3_addr_canonize().

diff --git a/CHANGES b/CHANGES
index b0d4012d3b3d2443b67da1b028da7777980eecfa..ceff533edcfc3b03193bb66995dad876028851e3 100644 (file)
--- 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 c6730ab3fd26a410ed4a8dd8dd2580a84b595912..63f4785325b8f311f663bd8d758a0da78da73438 100644 (file)
--- 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;