evp/e_aes_cbc_hmac_sha*.c: harmonize names, fix bugs.

[openssl.git] / crypto / objects / obj_xref.c

diff --git a/crypto/objects/obj_xref.c b/crypto/objects/obj_xref.c
index 963177ca5918f9bf1f2ff21d11dae81b0bfb6add..9f744bcededb177299af010530c4537b907454dc 100644 (file)
--- a/crypto/objects/obj_xref.c
+++ b/crypto/objects/obj_xref.c
@@ -1,5 +1,5 @@
 /* crypto/objects/obj_xref.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
 /* ====================================================================
@@ -59,69 +59,79 @@
 #include <openssl/objects.h>
 #include "obj_xref.h"
 
-STACK *sig_app, *sigx_app;
+DECLARE_STACK_OF(nid_triple)
+STACK_OF(nid_triple) *sig_app, *sigx_app;
 
-static int cmp_sig(const nid_triple *a, const nid_triple *b)
+static int sig_cmp(const nid_triple *a, const nid_triple *b)
        {
-       return **a - **b;
+       return a->sign_id - b->sign_id;
        }
 
-static int cmp_sig_sk(const nid_triple **a, const nid_triple **b)
+DECLARE_OBJ_BSEARCH_CMP_FN(nid_triple, nid_triple, sig);
+IMPLEMENT_OBJ_BSEARCH_CMP_FN(nid_triple, nid_triple, sig);
+
+static int sig_sk_cmp(const nid_triple * const *a, const nid_triple * const *b)
        {
-       return ***a - ***b;
+       return (*a)->sign_id - (*b)->sign_id;
        }
 
-static int cmp_sigx(const nid_triple **a, const nid_triple **b)
+DECLARE_OBJ_BSEARCH_CMP_FN(const nid_triple *, const nid_triple *, sigx);
+
+static int sigx_cmp(const nid_triple * const *a, const nid_triple * const *b)
        {
        int ret;
-       ret = (**a)[1] - (**b)[1];
+       ret = (*a)->hash_id - (*b)->hash_id;
        if (ret)
                return ret;
-       return (**a)[2] - (**b)[2];
+       return (*a)->pkey_id - (*b)->pkey_id;
        }
 
+IMPLEMENT_OBJ_BSEARCH_CMP_FN(const nid_triple *, const nid_triple *, sigx);
 
 int OBJ_find_sigid_algs(int signid, int *pdig_nid, int *ppkey_nid)
        {
-       nid_triple tmp, *rv = NULL;
-       tmp[0] = signid;
+       nid_triple tmp;
+       const nid_triple *rv = NULL;
+       tmp.sign_id = signid;
 
        if (sig_app)
                {
-               int idx = sk_find(sig_app, (char *)&tmp);
+               int idx = sk_nid_triple_find(sig_app, &tmp);
                if (idx >= 0)
-                       rv = (nid_triple *)sk_value(sig_app, idx);
+                       rv = sk_nid_triple_value(sig_app, idx);
                }
 
 #ifndef OBJ_XREF_TEST2
        if (rv == NULL)
                {
-               rv = (nid_triple *)OBJ_bsearch((char *)&tmp,
-                               (char *)sigoid_srt,
-                               sizeof(sigoid_srt) / sizeof(nid_triple),
-                               sizeof(nid_triple),
-                               (int (*)(const void *, const void *))cmp_sig);
+               rv = OBJ_bsearch_sig(&tmp, sigoid_srt,
+                                sizeof(sigoid_srt) / sizeof(nid_triple));
                }
 #endif
        if (rv == NULL)
                return 0;
-       *pdig_nid = (*rv)[1];
-       *ppkey_nid = (*rv)[2];
+       if (pdig_nid)
+               *pdig_nid = rv->hash_id;
+       if (ppkey_nid)
+               *ppkey_nid = rv->pkey_id;
        return 1;
        }
 
 int OBJ_find_sigid_by_algs(int *psignid, int dig_nid, int pkey_nid)
        {
-       nid_triple tmp, *t=&tmp, **rv = NULL;
-       tmp[1] = dig_nid;
-       tmp[2] = pkey_nid;
+       nid_triple tmp;
+       const nid_triple *t=&tmp;
+       const nid_triple **rv = NULL;
+
+       tmp.hash_id = dig_nid;
+       tmp.pkey_id = pkey_nid;
 
        if (sigx_app)
                {
-               int idx = sk_find(sigx_app, (char *)&tmp);
+               int idx = sk_nid_triple_find(sigx_app, &tmp);
                if (idx >= 0)
                        {
-                       t = (nid_triple *)sk_value(sigx_app, idx);
+                       t = sk_nid_triple_value(sigx_app, idx);
                        rv = &t;
                        }
                }
@@ -129,57 +139,53 @@ int OBJ_find_sigid_by_algs(int *psignid, int dig_nid, int pkey_nid)
 #ifndef OBJ_XREF_TEST2
        if (rv == NULL)
                {
-               rv = (nid_triple **)OBJ_bsearch((char *)&t,
-                               (char *)sigoid_srt_xref,
-                               sizeof(sigoid_srt_xref) / sizeof(nid_triple *),
-                               sizeof(nid_triple *),
-                               (int (*)(const void *, const void *))cmp_sigx);
+               rv = OBJ_bsearch_sigx(&t, sigoid_srt_xref,
+                                sizeof(sigoid_srt_xref) / sizeof(nid_triple *)
+                                );
                }
 #endif
        if (rv == NULL)
                return 0;
-       *psignid = (**rv)[0];
+       if (psignid)
+               *psignid = (*rv)->sign_id;
        return 1;
        }
 
-typedef int sk_cmp_fn_type(const char * const *a, const char * const *b);
-
 int OBJ_add_sigid(int signid, int dig_id, int pkey_id)
        {
        nid_triple *ntr;
        if (!sig_app)
-               sig_app = sk_new((sk_cmp_fn_type *)cmp_sig_sk);
+               sig_app = sk_nid_triple_new(sig_sk_cmp);
        if (!sig_app)
                return 0;
        if (!sigx_app)
-               sigx_app = sk_new((sk_cmp_fn_type *)cmp_sigx);
+               sigx_app = sk_nid_triple_new(sigx_cmp);
        if (!sigx_app)
                return 0;
        ntr = OPENSSL_malloc(sizeof(int) * 3);
        if (!ntr)
                return 0;
-       (*ntr)[0] = signid;
-       (*ntr)[1] = dig_id;
-       (*ntr)[2] = pkey_id;
+       ntr->sign_id = signid;
+       ntr->hash_id = dig_id;
+       ntr->pkey_id = pkey_id;
 
-       if (!sk_push(sig_app, (char *)ntr))
+       if (!sk_nid_triple_push(sig_app, ntr))
                {
                OPENSSL_free(ntr);
                return 0;
                }
 
-       if (!sk_push(sigx_app, (char *)ntr))
+       if (!sk_nid_triple_push(sigx_app, ntr))
                return 0;
 
-       sk_sort(sig_app);
-       sk_sort(sigx_app);
+       sk_nid_triple_sort(sig_app);
+       sk_nid_triple_sort(sigx_app);
 
        return 1;
        }
 
-static void sid_free(void *x)
+static void sid_free(nid_triple *tt)
        {
-       nid_triple *tt = (nid_triple *)x;
        OPENSSL_free(tt);
        }
 
@@ -187,12 +193,12 @@ void OBJ_sigid_free(void)
        {
        if (sig_app)
                {
-               sk_pop_free(sig_app, sid_free);
+               sk_nid_triple_pop_free(sig_app, sid_free);
                sig_app = NULL;
                }
        if (sigx_app)
                {
-               sk_free(sigx_app);
+               sk_nid_triple_free(sigx_app);
                sigx_app = NULL;
                }
        }