diff options
author | tb <> | 2021-12-28 21:06:01 +0000 |
---|---|---|
committer | tb <> | 2021-12-28 21:06:01 +0000 |
commit | 3f524126cc541821b2c21e5529385144d6b209d0 (patch) | |
tree | aae1e8890adbf4eef0c0b7536bb0a6b03c36b947 /src | |
parent | 886fb558d55a800e145044cc39982f181ede1b5d (diff) | |
download | openbsd-3f524126cc541821b2c21e5529385144d6b209d0.tar.gz openbsd-3f524126cc541821b2c21e5529385144d6b209d0.tar.bz2 openbsd-3f524126cc541821b2c21e5529385144d6b209d0.zip |
Use lowercase letters for hexadecimal constants, as both jsing and I
prefer this.
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/x509/x509_addr.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/lib/libcrypto/x509/x509_addr.c b/src/lib/libcrypto/x509/x509_addr.c index f9fd9f3ad0..168fed3467 100644 --- a/src/lib/libcrypto/x509/x509_addr.c +++ b/src/lib/libcrypto/x509/x509_addr.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509_addr.c,v 1.45 2021/12/28 21:00:27 tb Exp $ */ | 1 | /* $OpenBSD: x509_addr.c,v 1.46 2021/12/28 21:06:01 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Contributed to the OpenSSL Project by the American Registry for | 3 | * Contributed to the OpenSSL Project by the American Registry for |
4 | * Internet Numbers ("ARIN"). | 4 | * Internet Numbers ("ARIN"). |
@@ -447,7 +447,7 @@ addr_expand(unsigned char *addr, const ASN1_BIT_STRING *bs, const int length, | |||
447 | return 0; | 447 | return 0; |
448 | 448 | ||
449 | if (fill != 0) | 449 | if (fill != 0) |
450 | fill = 0xFF; | 450 | fill = 0xff; |
451 | 451 | ||
452 | if (bs->length > 0) { | 452 | if (bs->length > 0) { |
453 | /* XXX - shouldn't this check ASN1_STRING_FLAG_BITS_LEFT? */ | 453 | /* XXX - shouldn't this check ASN1_STRING_FLAG_BITS_LEFT? */ |
@@ -538,7 +538,7 @@ i2r_IPAddressOrRanges(BIO *out, const int indent, | |||
538 | aor->u.addressRange->min)) | 538 | aor->u.addressRange->min)) |
539 | return 0; | 539 | return 0; |
540 | BIO_puts(out, "-"); | 540 | BIO_puts(out, "-"); |
541 | if (!i2r_address(out, afi, 0xFF, | 541 | if (!i2r_address(out, afi, 0xff, |
542 | aor->u.addressRange->max)) | 542 | aor->u.addressRange->max)) |
543 | return 0; | 543 | return 0; |
544 | BIO_puts(out, "\n"); | 544 | BIO_puts(out, "\n"); |
@@ -706,7 +706,7 @@ range_should_be_prefix(const unsigned char *min, const unsigned char *max, | |||
706 | return -1; | 706 | return -1; |
707 | for (i = 0; i < length && min[i] == max[i]; i++) | 707 | for (i = 0; i < length && min[i] == max[i]; i++) |
708 | continue; | 708 | continue; |
709 | for (j = length - 1; j >= 0 && min[j] == 0x00 && max[j] == 0xFF; j--) | 709 | for (j = length - 1; j >= 0 && min[j] == 0x00 && max[j] == 0xff; j--) |
710 | continue; | 710 | continue; |
711 | if (i < j) | 711 | if (i < j) |
712 | return -1; | 712 | return -1; |
@@ -723,16 +723,16 @@ range_should_be_prefix(const unsigned char *min, const unsigned char *max, | |||
723 | case 0x07: | 723 | case 0x07: |
724 | j = 5; | 724 | j = 5; |
725 | break; | 725 | break; |
726 | case 0x0F: | 726 | case 0x0f: |
727 | j = 4; | 727 | j = 4; |
728 | break; | 728 | break; |
729 | case 0x1F: | 729 | case 0x1f: |
730 | j = 3; | 730 | j = 3; |
731 | break; | 731 | break; |
732 | case 0x3F: | 732 | case 0x3f: |
733 | j = 2; | 733 | j = 2; |
734 | break; | 734 | break; |
735 | case 0x7F: | 735 | case 0x7f: |
736 | j = 1; | 736 | j = 1; |
737 | break; | 737 | break; |
738 | default: | 738 | default: |
@@ -765,7 +765,7 @@ make_addressPrefix(IPAddressOrRange **result, unsigned char *addr, | |||
765 | aor->u.addressPrefix->flags &= ~7; | 765 | aor->u.addressPrefix->flags &= ~7; |
766 | aor->u.addressPrefix->flags |= ASN1_STRING_FLAG_BITS_LEFT; | 766 | aor->u.addressPrefix->flags |= ASN1_STRING_FLAG_BITS_LEFT; |
767 | if (bitlen > 0) { | 767 | if (bitlen > 0) { |
768 | aor->u.addressPrefix->data[bytelen - 1] &= ~(0xFF >> bitlen); | 768 | aor->u.addressPrefix->data[bytelen - 1] &= ~(0xff >> bitlen); |
769 | aor->u.addressPrefix->flags |= 8 - bitlen; | 769 | aor->u.addressPrefix->flags |= 8 - bitlen; |
770 | } | 770 | } |
771 | 771 | ||
@@ -813,12 +813,12 @@ make_addressRange(IPAddressOrRange **result, unsigned char *min, | |||
813 | if (i > 0) { | 813 | if (i > 0) { |
814 | unsigned char b = min[i - 1]; | 814 | unsigned char b = min[i - 1]; |
815 | int j = 1; | 815 | int j = 1; |
816 | while ((b & (0xFFU >> j)) != 0) | 816 | while ((b & (0xffU >> j)) != 0) |
817 | ++j; | 817 | ++j; |
818 | aor->u.addressRange->min->flags |= 8 - j; | 818 | aor->u.addressRange->min->flags |= 8 - j; |
819 | } | 819 | } |
820 | 820 | ||
821 | for (i = length; i > 0 && max[i - 1] == 0xFF; --i) | 821 | for (i = length; i > 0 && max[i - 1] == 0xff; --i) |
822 | continue; | 822 | continue; |
823 | if (!ASN1_BIT_STRING_set(aor->u.addressRange->max, max, i)) | 823 | if (!ASN1_BIT_STRING_set(aor->u.addressRange->max, max, i)) |
824 | goto err; | 824 | goto err; |
@@ -827,7 +827,7 @@ make_addressRange(IPAddressOrRange **result, unsigned char *min, | |||
827 | if (i > 0) { | 827 | if (i > 0) { |
828 | unsigned char b = max[i - 1]; | 828 | unsigned char b = max[i - 1]; |
829 | int j = 1; | 829 | int j = 1; |
830 | while ((b & (0xFFU >> j)) != (0xFFU >> j)) | 830 | while ((b & (0xffU >> j)) != (0xffU >> j)) |
831 | ++j; | 831 | ++j; |
832 | aor->u.addressRange->max->flags |= 8 - j; | 832 | aor->u.addressRange->max->flags |= 8 - j; |
833 | } | 833 | } |
@@ -1014,11 +1014,11 @@ extract_min_max(IPAddressOrRange *aor, unsigned char *min, unsigned char *max, | |||
1014 | switch (aor->type) { | 1014 | switch (aor->type) { |
1015 | case IPAddressOrRange_addressPrefix: | 1015 | case IPAddressOrRange_addressPrefix: |
1016 | return (addr_expand(min, aor->u.addressPrefix, length, 0x00) && | 1016 | return (addr_expand(min, aor->u.addressPrefix, length, 0x00) && |
1017 | addr_expand(max, aor->u.addressPrefix, length, 0xFF)); | 1017 | addr_expand(max, aor->u.addressPrefix, length, 0xff)); |
1018 | case IPAddressOrRange_addressRange: | 1018 | case IPAddressOrRange_addressRange: |
1019 | return (addr_expand(min, aor->u.addressRange->min, length, | 1019 | return (addr_expand(min, aor->u.addressRange->min, length, |
1020 | 0x00) && | 1020 | 0x00) && |
1021 | addr_expand(max, aor->u.addressRange->max, length, 0xFF)); | 1021 | addr_expand(max, aor->u.addressRange->max, length, 0xff)); |
1022 | } | 1022 | } |
1023 | return 0; | 1023 | return 0; |
1024 | } | 1024 | } |
@@ -1372,7 +1372,7 @@ v2i_IPAddrBlocks(const struct v3_ext_method *method, struct v3_ext_ctx *ctx, | |||
1372 | } | 1372 | } |
1373 | /* Range and overflow check. */ | 1373 | /* Range and overflow check. */ |
1374 | if ((errno == ERANGE && parsed_safi == ULONG_MAX) || | 1374 | if ((errno == ERANGE && parsed_safi == ULONG_MAX) || |
1375 | parsed_safi > 0xFF) { | 1375 | parsed_safi > 0xff) { |
1376 | X509V3error(X509V3_R_INVALID_SAFI); | 1376 | X509V3error(X509V3_R_INVALID_SAFI); |
1377 | X509V3_conf_err(val); | 1377 | X509V3_conf_err(val); |
1378 | goto err; | 1378 | goto err; |