diff options
| author | marha <marha@users.sourceforge.net> | 2010-03-29 17:08:02 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-03-29 17:08:02 +0000 |
| commit | 15272ab4ed1e6250412fccd48200ed9eae59608f (patch) | |
| tree | a5996ea67966a778a16565f19dfc2e7c7f49b376 /openssl/crypto/store/str_lib.c | |
| parent | 3827301b2ea5a45ac009c3bf9f08586ff40b8506 (diff) | |
| download | vcxsrv-15272ab4ed1e6250412fccd48200ed9eae59608f.tar.gz vcxsrv-15272ab4ed1e6250412fccd48200ed9eae59608f.tar.bz2 vcxsrv-15272ab4ed1e6250412fccd48200ed9eae59608f.zip | |
Updated to openssl 1.0.0
Diffstat (limited to 'openssl/crypto/store/str_lib.c')
| -rw-r--r-- | openssl/crypto/store/str_lib.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/openssl/crypto/store/str_lib.c b/openssl/crypto/store/str_lib.c index 32ae5bd39..f1dbcbd0e 100644 --- a/openssl/crypto/store/str_lib.c +++ b/openssl/crypto/store/str_lib.c @@ -1670,7 +1670,7 @@ int STORE_parse_attrs_endp(void *handle) } static int attr_info_compare_compute_range( - unsigned char *abits, unsigned char *bbits, + const unsigned char *abits, const unsigned char *bbits, unsigned int *alowp, unsigned int *ahighp, unsigned int *blowp, unsigned int *bhighp) { @@ -1739,13 +1739,15 @@ static int attr_info_compare_compute_range( return res; } -int STORE_ATTR_INFO_compare(STORE_ATTR_INFO *a, STORE_ATTR_INFO *b) +int STORE_ATTR_INFO_compare(const STORE_ATTR_INFO * const *a, + const STORE_ATTR_INFO * const *b) { if (a == b) return 0; if (!a) return -1; if (!b) return 1; - return attr_info_compare_compute_range(a->set, b->set, 0, 0, 0, 0); + return attr_info_compare_compute_range((*a)->set, (*b)->set, 0, 0, 0, 0); } + int STORE_ATTR_INFO_in_range(STORE_ATTR_INFO *a, STORE_ATTR_INFO *b) { unsigned int alow, ahigh, blow, bhigh; @@ -1759,6 +1761,7 @@ int STORE_ATTR_INFO_in_range(STORE_ATTR_INFO *a, STORE_ATTR_INFO *b) return 1; return 0; } + int STORE_ATTR_INFO_in(STORE_ATTR_INFO *a, STORE_ATTR_INFO *b) { unsigned char *abits, *bbits; @@ -1776,6 +1779,7 @@ int STORE_ATTR_INFO_in(STORE_ATTR_INFO *a, STORE_ATTR_INFO *b) } return 1; } + int STORE_ATTR_INFO_in_ex(STORE_ATTR_INFO *a, STORE_ATTR_INFO *b) { STORE_ATTR_TYPES i; |