};
typedef int sk_cmp_fn_type(const char * const *a, const char * const *b);
-static STACK *app_methods = NULL;
+DECLARE_STACK_OF(EVP_PKEY_ASN1_METHOD)
+static STACK_OF(EVP_PKEY_ASN1_METHOD) *app_methods = NULL;
}
#endif
+DECLARE_OBJ_BSEARCH_CMP_FN(EVP_PKEY_ASN1_METHOD *,
+ const EVP_PKEY_ASN1_METHOD *, ameth_cmp);
+
static int ameth_cmp(const EVP_PKEY_ASN1_METHOD * const *a,
- const EVP_PKEY_ASN1_METHOD * const *b)
+ const EVP_PKEY_ASN1_METHOD * const *b)
{
return ((*a)->pkey_id - (*b)->pkey_id);
}
+IMPLEMENT_OBJ_BSEARCH_CMP_FN(EVP_PKEY_ASN1_METHOD *,
+ const EVP_PKEY_ASN1_METHOD *, ameth_cmp);
+
int EVP_PKEY_asn1_get_count(void)
{
int num = sizeof(standard_methods)/sizeof(EVP_PKEY_ASN1_METHOD *);
if (app_methods)
- num += sk_num(app_methods);
+ num += sk_EVP_PKEY_ASN1_METHOD_num(app_methods);
return num;
}
if (idx < num)
return standard_methods[idx];
idx -= num;
- return (const EVP_PKEY_ASN1_METHOD *)sk_value(app_methods, idx);
+ return sk_EVP_PKEY_ASN1_METHOD_value(app_methods, idx);
}
static const EVP_PKEY_ASN1_METHOD *pkey_asn1_find(int type)
{
- EVP_PKEY_ASN1_METHOD tmp, *t = &tmp, **ret;
+ EVP_PKEY_ASN1_METHOD tmp, *t = &tmp;
+ const EVP_PKEY_ASN1_METHOD **ret;
tmp.pkey_id = type;
if (app_methods)
{
int idx;
- idx = sk_find(app_methods, (char *)&tmp);
+ idx = sk_EVP_PKEY_ASN1_METHOD_find(app_methods, &tmp);
if (idx >= 0)
- return (EVP_PKEY_ASN1_METHOD *)
- sk_value(app_methods, idx);
+ return sk_EVP_PKEY_ASN1_METHOD_value(app_methods, idx);
}
- ret = (EVP_PKEY_ASN1_METHOD **) OBJ_bsearch((char *)&t,
- (char *)standard_methods,
- sizeof(standard_methods)/sizeof(EVP_PKEY_ASN1_METHOD *),
- sizeof(EVP_PKEY_ASN1_METHOD *),
- (int (*)(const void *, const void *))ameth_cmp);
+ ret = OBJ_bsearch(EVP_PKEY_ASN1_METHOD *, &t,
+ const EVP_PKEY_ASN1_METHOD *, standard_methods,
+ sizeof(standard_methods)
+ /sizeof(EVP_PKEY_ASN1_METHOD *),
+ ameth_cmp);
if (!ret || !*ret)
return NULL;
return *ret;
{
#ifndef OPENSSL_NO_ENGINE
ENGINE *e;
- for (e = ENGINE_get_first(); e; e = ENGINE_get_next(e))
+ ameth = ENGINE_pkey_asn1_find_str(&e, str, len);
+ if (ameth)
{
- ameth = ENGINE_get_pkey_asn1_meth_str(e, str, len);
- if (ameth)
- {
- /* Convert structural into
- * functional reference
- */
- if (!ENGINE_init(e))
- ameth = NULL;
- ENGINE_free(e);
- *pe = e;
- return ameth;
- }
+ /* Convert structural into
+ * functional reference
+ */
+ if (!ENGINE_init(e))
+ ameth = NULL;
+ ENGINE_free(e);
+ *pe = e;
+ return ameth;
}
#endif
*pe = NULL;
{
if (app_methods == NULL)
{
- app_methods = sk_new((sk_cmp_fn_type *)ameth_cmp);
+ app_methods = sk_EVP_PKEY_ASN1_METHOD_new(ameth_cmp);
if (!app_methods)
return 0;
}
- if (!sk_push(app_methods, (char *)ameth))
+ if (!sk_EVP_PKEY_ASN1_METHOD_push(app_methods, ameth))
return 0;
- sk_sort(app_methods);
+ sk_EVP_PKEY_ASN1_METHOD_sort(app_methods);
return 1;
}