diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2008-10-22 15:43:01 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2008-10-22 15:43:01 +0000 |
| commit | e19106f5fb7da7db15449a9a50f9be9047800757 (patch) | |
| tree | 0341d860168821112fb47ded07b1f761895c04cd /ssl/s2_lib.c | |
| parent | ae7ec4c71de74fa52c5d89e32e28445c6602990d (diff) | |
Create function of the form OBJ_bsearch_xxx() in bsearch typesafe macros
with the appropriate parameters which calls OBJ_bsearch(). A compiler will
typically inline this.
This avoids the need for cmp_xxx variables and fixes unchecked const issues
with CHECKED_PTR_OF()
Diffstat (limited to 'ssl/s2_lib.c')
| -rw-r--r-- | ssl/s2_lib.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ssl/s2_lib.c b/ssl/s2_lib.c index 0f311c3fab..4cfafcedf1 100644 --- a/ssl/s2_lib.c +++ b/ssl/s2_lib.c @@ -413,7 +413,7 @@ long ssl2_ctx_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp)(void)) } IMPLEMENT_OBJ_BSEARCH_GLOBAL_CMP_FN(SSL_CIPHER, SSL_CIPHER, - ssl_cipher_id_cmp); + ssl_cipher_id); /* This function needs to check if the ciphers required are actually * available */ @@ -426,8 +426,7 @@ const SSL_CIPHER *ssl2_get_cipher_by_char(const unsigned char *p) id=0x02000000L|((unsigned long)p[0]<<16L)| ((unsigned long)p[1]<<8L)|(unsigned long)p[2]; c.id=id; - cp = OBJ_bsearch(const SSL_CIPHER, &c, const SSL_CIPHER, ssl2_ciphers, - SSL2_NUM_CIPHERS, ssl_cipher_id_cmp); + cp = OBJ_bsearch_ssl_cipher_id(&c, ssl2_ciphers, SSL2_NUM_CIPHERS); if ((cp == NULL) || (cp->valid == 0)) return NULL; else |