diff options
| author | djm <> | 2009-01-05 21:36:39 +0000 |
|---|---|---|
| committer | djm <> | 2009-01-05 21:36:39 +0000 |
| commit | 3be551b5922b665fd4e18cd65b857b9f92a0b6c8 (patch) | |
| tree | e0d2d687fbd4e4e9eb6bc4b178ea069817f0aba4 /src/lib/libcrypto/x509v3/v3_addr.c | |
| parent | 822633f8798a6b4646a8b092e7c67f511cdbdba2 (diff) | |
| download | openbsd-3be551b5922b665fd4e18cd65b857b9f92a0b6c8.tar.gz openbsd-3be551b5922b665fd4e18cd65b857b9f92a0b6c8.tar.bz2 openbsd-3be551b5922b665fd4e18cd65b857b9f92a0b6c8.zip | |
update to openssl-0.9.8i; tested by several, especially krw@
Diffstat (limited to 'src/lib/libcrypto/x509v3/v3_addr.c')
| -rw-r--r-- | src/lib/libcrypto/x509v3/v3_addr.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libcrypto/x509v3/v3_addr.c b/src/lib/libcrypto/x509v3/v3_addr.c index ed9847b307..c6730ab3fd 100644 --- a/src/lib/libcrypto/x509v3/v3_addr.c +++ b/src/lib/libcrypto/x509v3/v3_addr.c | |||
| @@ -594,10 +594,10 @@ static IPAddressOrRanges *make_prefix_or_range(IPAddrBlocks *addr, | |||
| 594 | return NULL; | 594 | return NULL; |
| 595 | switch (afi) { | 595 | switch (afi) { |
| 596 | case IANA_AFI_IPV4: | 596 | case IANA_AFI_IPV4: |
| 597 | sk_IPAddressOrRange_set_cmp_func(aors, v4IPAddressOrRange_cmp); | 597 | (void)sk_IPAddressOrRange_set_cmp_func(aors, v4IPAddressOrRange_cmp); |
| 598 | break; | 598 | break; |
| 599 | case IANA_AFI_IPV6: | 599 | case IANA_AFI_IPV6: |
| 600 | sk_IPAddressOrRange_set_cmp_func(aors, v6IPAddressOrRange_cmp); | 600 | (void)sk_IPAddressOrRange_set_cmp_func(aors, v6IPAddressOrRange_cmp); |
| 601 | break; | 601 | break; |
| 602 | } | 602 | } |
| 603 | f->ipAddressChoice->type = IPAddressChoice_addressesOrRanges; | 603 | f->ipAddressChoice->type = IPAddressChoice_addressesOrRanges; |
| @@ -854,7 +854,7 @@ static int IPAddressOrRanges_canonize(IPAddressOrRanges *aors, | |||
| 854 | if (!make_addressRange(&merged, a_min, b_max, length)) | 854 | if (!make_addressRange(&merged, a_min, b_max, length)) |
| 855 | return 0; | 855 | return 0; |
| 856 | sk_IPAddressOrRange_set(aors, i, merged); | 856 | sk_IPAddressOrRange_set(aors, i, merged); |
| 857 | sk_IPAddressOrRange_delete(aors, i + 1); | 857 | (void)sk_IPAddressOrRange_delete(aors, i + 1); |
| 858 | IPAddressOrRange_free(a); | 858 | IPAddressOrRange_free(a); |
| 859 | IPAddressOrRange_free(b); | 859 | IPAddressOrRange_free(b); |
| 860 | --i; | 860 | --i; |
| @@ -1122,7 +1122,7 @@ int v3_addr_subset(IPAddrBlocks *a, IPAddrBlocks *b) | |||
| 1122 | return 1; | 1122 | return 1; |
| 1123 | if (b == NULL || v3_addr_inherits(a) || v3_addr_inherits(b)) | 1123 | if (b == NULL || v3_addr_inherits(a) || v3_addr_inherits(b)) |
| 1124 | return 0; | 1124 | return 0; |
| 1125 | sk_IPAddressFamily_set_cmp_func(b, IPAddressFamily_cmp); | 1125 | (void)sk_IPAddressFamily_set_cmp_func(b, IPAddressFamily_cmp); |
| 1126 | for (i = 0; i < sk_IPAddressFamily_num(a); i++) { | 1126 | for (i = 0; i < sk_IPAddressFamily_num(a); i++) { |
| 1127 | IPAddressFamily *fa = sk_IPAddressFamily_value(a, i); | 1127 | IPAddressFamily *fa = sk_IPAddressFamily_value(a, i); |
| 1128 | int j = sk_IPAddressFamily_find(b, fa); | 1128 | int j = sk_IPAddressFamily_find(b, fa); |
| @@ -1183,7 +1183,7 @@ static int v3_addr_validate_path_internal(X509_STORE_CTX *ctx, | |||
| 1183 | } | 1183 | } |
| 1184 | if (!v3_addr_is_canonical(ext)) | 1184 | if (!v3_addr_is_canonical(ext)) |
| 1185 | validation_err(X509_V_ERR_INVALID_EXTENSION); | 1185 | validation_err(X509_V_ERR_INVALID_EXTENSION); |
| 1186 | sk_IPAddressFamily_set_cmp_func(ext, IPAddressFamily_cmp); | 1186 | (void)sk_IPAddressFamily_set_cmp_func(ext, IPAddressFamily_cmp); |
| 1187 | if ((child = sk_IPAddressFamily_dup(ext)) == NULL) { | 1187 | if ((child = sk_IPAddressFamily_dup(ext)) == NULL) { |
| 1188 | X509V3err(X509V3_F_V3_ADDR_VALIDATE_PATH_INTERNAL, ERR_R_MALLOC_FAILURE); | 1188 | X509V3err(X509V3_F_V3_ADDR_VALIDATE_PATH_INTERNAL, ERR_R_MALLOC_FAILURE); |
| 1189 | ret = 0; | 1189 | ret = 0; |
| @@ -1209,7 +1209,7 @@ static int v3_addr_validate_path_internal(X509_STORE_CTX *ctx, | |||
| 1209 | } | 1209 | } |
| 1210 | continue; | 1210 | continue; |
| 1211 | } | 1211 | } |
| 1212 | sk_IPAddressFamily_set_cmp_func(x->rfc3779_addr, IPAddressFamily_cmp); | 1212 | (void)sk_IPAddressFamily_set_cmp_func(x->rfc3779_addr, IPAddressFamily_cmp); |
| 1213 | for (j = 0; j < sk_IPAddressFamily_num(child); j++) { | 1213 | for (j = 0; j < sk_IPAddressFamily_num(child); j++) { |
| 1214 | IPAddressFamily *fc = sk_IPAddressFamily_value(child, j); | 1214 | IPAddressFamily *fc = sk_IPAddressFamily_value(child, j); |
| 1215 | int k = sk_IPAddressFamily_find(x->rfc3779_addr, fc); | 1215 | int k = sk_IPAddressFamily_find(x->rfc3779_addr, fc); |
