Set comparison function in v3_add_canonize().

diff --git a/CHANGES b/CHANGES
index 198c7a8553c2a69a06c1ee33e552b3e0384bfccd..c9d12ea5d4aa8970ecc005e1605aecd8f9967950 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -722,6 +722,9 @@
 
  Changes between 0.9.8i and 0.9.8j  [xx XXX xxxx]
 
 
  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>]
 
   *) 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 65371051084863824d4b5dbcdcea7c8959ff1375..16eaa730f53f5ba8dfcbd831fcecc7ceeed4db5e 100644 (file)
--- a/crypto/x509v3/v3_addr.c
+++ b/crypto/x509v3/v3_addr.c
@@ -877,6 +877,7 @@ int v3_addr_canonize(IPAddrBlocks *addr)
                                    v3_addr_get_afi(f)))
       return 0;
   }
                                    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;
   sk_IPAddressFamily_sort(addr);
   assert(v3_addr_is_canonical(addr));
   return 1;