diff options
Diffstat (limited to 'src/lib/libcrypto/store/str_lib.c')
| -rw-r--r-- | src/lib/libcrypto/store/str_lib.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/lib/libcrypto/store/str_lib.c b/src/lib/libcrypto/store/str_lib.c index 32ae5bd395..f1dbcbd0e0 100644 --- a/src/lib/libcrypto/store/str_lib.c +++ b/src/lib/libcrypto/store/str_lib.c | |||
| @@ -1670,7 +1670,7 @@ int STORE_parse_attrs_endp(void *handle) | |||
| 1670 | } | 1670 | } |
| 1671 | 1671 | ||
| 1672 | static int attr_info_compare_compute_range( | 1672 | static int attr_info_compare_compute_range( |
| 1673 | unsigned char *abits, unsigned char *bbits, | 1673 | const unsigned char *abits, const unsigned char *bbits, |
| 1674 | unsigned int *alowp, unsigned int *ahighp, | 1674 | unsigned int *alowp, unsigned int *ahighp, |
| 1675 | unsigned int *blowp, unsigned int *bhighp) | 1675 | unsigned int *blowp, unsigned int *bhighp) |
| 1676 | { | 1676 | { |
| @@ -1739,13 +1739,15 @@ static int attr_info_compare_compute_range( | |||
| 1739 | return res; | 1739 | return res; |
| 1740 | } | 1740 | } |
| 1741 | 1741 | ||
| 1742 | int STORE_ATTR_INFO_compare(STORE_ATTR_INFO *a, STORE_ATTR_INFO *b) | 1742 | int STORE_ATTR_INFO_compare(const STORE_ATTR_INFO * const *a, |
| 1743 | const STORE_ATTR_INFO * const *b) | ||
| 1743 | { | 1744 | { |
| 1744 | if (a == b) return 0; | 1745 | if (a == b) return 0; |
| 1745 | if (!a) return -1; | 1746 | if (!a) return -1; |
| 1746 | if (!b) return 1; | 1747 | if (!b) return 1; |
| 1747 | return attr_info_compare_compute_range(a->set, b->set, 0, 0, 0, 0); | 1748 | return attr_info_compare_compute_range((*a)->set, (*b)->set, 0, 0, 0, 0); |
| 1748 | } | 1749 | } |
| 1750 | |||
| 1749 | int STORE_ATTR_INFO_in_range(STORE_ATTR_INFO *a, STORE_ATTR_INFO *b) | 1751 | int STORE_ATTR_INFO_in_range(STORE_ATTR_INFO *a, STORE_ATTR_INFO *b) |
| 1750 | { | 1752 | { |
| 1751 | unsigned int alow, ahigh, blow, bhigh; | 1753 | unsigned int alow, ahigh, blow, bhigh; |
| @@ -1759,6 +1761,7 @@ int STORE_ATTR_INFO_in_range(STORE_ATTR_INFO *a, STORE_ATTR_INFO *b) | |||
| 1759 | return 1; | 1761 | return 1; |
| 1760 | return 0; | 1762 | return 0; |
| 1761 | } | 1763 | } |
| 1764 | |||
| 1762 | int STORE_ATTR_INFO_in(STORE_ATTR_INFO *a, STORE_ATTR_INFO *b) | 1765 | int STORE_ATTR_INFO_in(STORE_ATTR_INFO *a, STORE_ATTR_INFO *b) |
| 1763 | { | 1766 | { |
| 1764 | unsigned char *abits, *bbits; | 1767 | unsigned char *abits, *bbits; |
| @@ -1776,6 +1779,7 @@ int STORE_ATTR_INFO_in(STORE_ATTR_INFO *a, STORE_ATTR_INFO *b) | |||
| 1776 | } | 1779 | } |
| 1777 | return 1; | 1780 | return 1; |
| 1778 | } | 1781 | } |
| 1782 | |||
| 1779 | int STORE_ATTR_INFO_in_ex(STORE_ATTR_INFO *a, STORE_ATTR_INFO *b) | 1783 | int STORE_ATTR_INFO_in_ex(STORE_ATTR_INFO *a, STORE_ATTR_INFO *b) |
| 1780 | { | 1784 | { |
| 1781 | STORE_ATTR_TYPES i; | 1785 | STORE_ATTR_TYPES i; |
