From 28b6d5020ee928ee41d360628d904bf2f31eec92 Mon Sep 17 00:00:00 2001
From: Ben Laurie <ben@openssl.org>
Date: Tue, 14 Oct 2008 19:27:07 +0000
Subject: [PATCH] Set comparison function in v3_add_canonize().

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

diff --git a/CHANGES b/CHANGES
index 198c7a8553..c9d12ea5d4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -722,6 +722,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 6537105108..16eaa730f5 100644
--- 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;
   }
+  sk_IPAddressFamily_set_cmp_func(addr, IPAddressFamily_cmp);
   sk_IPAddressFamily_sort(addr);
   assert(v3_addr_is_canonical(addr));
   return 1;
-- 
GitLab