projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix cross reference table generator.
[oweals/openssl.git]
/
crypto
/
objects
/
obj_xref.c
diff --git
a/crypto/objects/obj_xref.c
b/crypto/objects/obj_xref.c
index 3e85e7a576bcf4617cf17bd4b7036019cd0c3640..9f744bcededb177299af010530c4537b907454dc 100644
(file)
--- a/
crypto/objects/obj_xref.c
+++ b/
crypto/objects/obj_xref.c
@@
-1,5
+1,5
@@
/* crypto/objects/obj_xref.c */
/* crypto/objects/obj_xref.c */
-/* Written by Dr Stephen N Henson (s
henson@bigfoot.com
) for the OpenSSL
+/* Written by Dr Stephen N Henson (s
teve@openssl.org
) for the OpenSSL
* project 2006.
*/
/* ====================================================================
* project 2006.
*/
/* ====================================================================
@@
-62,22
+62,22
@@
DECLARE_STACK_OF(nid_triple)
STACK_OF(nid_triple) *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->sign_id - b->sign_id;
}
{
return a->sign_id - b->sign_id;
}
-DECLARE_OBJ_BSEARCH_CMP_FN(
const nid_triple, const nid_triple, cmp_
sig);
-IMPLEMENT_OBJ_BSEARCH_CMP_FN(
const nid_triple, const nid_triple, cmp_sig)
+DECLARE_OBJ_BSEARCH_CMP_FN(
nid_triple, nid_triple,
sig);
+IMPLEMENT_OBJ_BSEARCH_CMP_FN(
nid_triple, nid_triple, sig);
-static int
cmp_sig_sk
(const nid_triple * const *a, const nid_triple * const *b)
+static int
sig_sk_cmp
(const nid_triple * const *a, const nid_triple * const *b)
{
return (*a)->sign_id - (*b)->sign_id;
}
{
return (*a)->sign_id - (*b)->sign_id;
}
-DECLARE_OBJ_BSEARCH_CMP_FN(const nid_triple *, const nid_triple *,
cmp_
sigx);
+DECLARE_OBJ_BSEARCH_CMP_FN(const nid_triple *, const nid_triple *, sigx);
-static int
cmp_sigx
(const nid_triple * const *a, const nid_triple * const *b)
+static int
sigx_cmp
(const nid_triple * const *a, const nid_triple * const *b)
{
int ret;
ret = (*a)->hash_id - (*b)->hash_id;
{
int ret;
ret = (*a)->hash_id - (*b)->hash_id;
@@
-86,7
+86,7
@@
static int cmp_sigx(const nid_triple * const *a, const nid_triple * const *b)
return (*a)->pkey_id - (*b)->pkey_id;
}
return (*a)->pkey_id - (*b)->pkey_id;
}
-IMPLEMENT_OBJ_BSEARCH_CMP_FN(const nid_triple *, const nid_triple *,
cmp_sigx)
+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)
{
int OBJ_find_sigid_algs(int signid, int *pdig_nid, int *ppkey_nid)
{
@@
-104,23
+104,23
@@
int OBJ_find_sigid_algs(int signid, int *pdig_nid, int *ppkey_nid)
#ifndef OBJ_XREF_TEST2
if (rv == NULL)
{
#ifndef OBJ_XREF_TEST2
if (rv == NULL)
{
- rv = OBJ_bsearch(const nid_triple,&tmp,
- const nid_triple,sigoid_srt,
- sizeof(sigoid_srt) / sizeof(nid_triple),
- cmp_sig);
+ rv = OBJ_bsearch_sig(&tmp, sigoid_srt,
+ sizeof(sigoid_srt) / sizeof(nid_triple));
}
#endif
if (rv == NULL)
return 0;
}
#endif
if (rv == NULL)
return 0;
- *pdig_nid = rv->hash_id;
- *ppkey_nid = rv->pkey_id;
+ 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;
return 1;
}
int OBJ_find_sigid_by_algs(int *psignid, int dig_nid, int pkey_nid)
{
nid_triple tmp;
- const nid_triple
const
*t=&tmp;
+ const nid_triple *t=&tmp;
const nid_triple **rv = NULL;
tmp.hash_id = dig_nid;
const nid_triple **rv = NULL;
tmp.hash_id = dig_nid;
@@
-139,15
+139,15
@@
int OBJ_find_sigid_by_algs(int *psignid, int dig_nid, int pkey_nid)
#ifndef OBJ_XREF_TEST2
if (rv == NULL)
{
#ifndef OBJ_XREF_TEST2
if (rv == NULL)
{
- rv = OBJ_bsearch(const nid_triple *,&t,
- const nid_triple *,sigoid_srt_xref,
- sizeof(sigoid_srt_xref) / sizeof(nid_triple *),
- cmp_sigx);
+ rv = OBJ_bsearch_sigx(&t, sigoid_srt_xref,
+ sizeof(sigoid_srt_xref) / sizeof(nid_triple *)
+ );
}
#endif
if (rv == NULL)
return 0;
}
#endif
if (rv == NULL)
return 0;
- *psignid = (*rv)->sign_id;
+ if (psignid)
+ *psignid = (*rv)->sign_id;
return 1;
}
return 1;
}
@@
-155,11
+155,11
@@
int OBJ_add_sigid(int signid, int dig_id, int pkey_id)
{
nid_triple *ntr;
if (!sig_app)
{
nid_triple *ntr;
if (!sig_app)
- sig_app = sk_nid_triple_new(
cmp_sig_sk
);
+ sig_app = sk_nid_triple_new(
sig_sk_cmp
);
if (!sig_app)
return 0;
if (!sigx_app)
if (!sig_app)
return 0;
if (!sigx_app)
- sigx_app = sk_nid_triple_new(
cmp_sigx
);
+ sigx_app = sk_nid_triple_new(
sigx_cmp
);
if (!sigx_app)
return 0;
ntr = OPENSSL_malloc(sizeof(int) * 3);
if (!sigx_app)
return 0;
ntr = OPENSSL_malloc(sizeof(int) * 3);