diff options
| author | djm <> | 2009-01-09 12:15:52 +0000 |
|---|---|---|
| committer | djm <> | 2009-01-09 12:15:52 +0000 |
| commit | 23f8d96f0f508b8bef2602049feee9c44228d34c (patch) | |
| tree | a2a7787bc00e8f6a29153b8c6d9eb5e8f73d6269 /src/lib/libcrypto/x509v3/v3_addr.c | |
| parent | 30562050421d947c3eb3c10edde6e87730b17471 (diff) | |
| download | openbsd-23f8d96f0f508b8bef2602049feee9c44228d34c.tar.gz openbsd-23f8d96f0f508b8bef2602049feee9c44228d34c.tar.bz2 openbsd-23f8d96f0f508b8bef2602049feee9c44228d34c.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/x509v3/v3_addr.c')
| -rw-r--r-- | src/lib/libcrypto/x509v3/v3_addr.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lib/libcrypto/x509v3/v3_addr.c b/src/lib/libcrypto/x509v3/v3_addr.c index c6730ab3fd..a37f844d3c 100644 --- a/src/lib/libcrypto/x509v3/v3_addr.c +++ b/src/lib/libcrypto/x509v3/v3_addr.c | |||
| @@ -878,6 +878,7 @@ int v3_addr_canonize(IPAddrBlocks *addr) | |||
| 878 | v3_addr_get_afi(f))) | 878 | v3_addr_get_afi(f))) |
| 879 | return 0; | 879 | return 0; |
| 880 | } | 880 | } |
| 881 | (void)sk_IPAddressFamily_set_cmp_func(addr, IPAddressFamily_cmp); | ||
| 881 | sk_IPAddressFamily_sort(addr); | 882 | sk_IPAddressFamily_sort(addr); |
| 882 | assert(v3_addr_is_canonical(addr)); | 883 | assert(v3_addr_is_canonical(addr)); |
| 883 | return 1; | 884 | return 1; |