This commits the changes to STACK macros forced by recent ENGINE surgery.

diff --git a/crypto/stack/safestack.h b/crypto/stack/safestack.h
index d997f95c5cef7ede038e7288da614922e77f0b4e..5dc03fc85243ddd22992091e72f4c602059b4945 100644 (file)
--- a/crypto/stack/safestack.h
+++ b/crypto/stack/safestack.h
@@ -424,25 +424,45 @@ STACK_OF(type) \
 #define sk_DIST_POINT_pop(st) SKM_sk_pop(DIST_POINT, (st))
 #define sk_DIST_POINT_sort(st) SKM_sk_sort(DIST_POINT, (st))
 
-#define sk_ENGINE_EVP_CIPHER_new(st) SKM_sk_new(ENGINE_EVP_CIPHER, (st))
-#define sk_ENGINE_EVP_CIPHER_new_null() SKM_sk_new_null(ENGINE_EVP_CIPHER)
-#define sk_ENGINE_EVP_CIPHER_free(st) SKM_sk_free(ENGINE_EVP_CIPHER, (st))
-#define sk_ENGINE_EVP_CIPHER_num(st) SKM_sk_num(ENGINE_EVP_CIPHER, (st))
-#define sk_ENGINE_EVP_CIPHER_value(st, i) SKM_sk_value(ENGINE_EVP_CIPHER, (st), (i))
-#define sk_ENGINE_EVP_CIPHER_set(st, i, val) SKM_sk_set(ENGINE_EVP_CIPHER, (st), (i), (val))
-#define sk_ENGINE_EVP_CIPHER_zero(st) SKM_sk_zero(ENGINE_EVP_CIPHER, (st))
-#define sk_ENGINE_EVP_CIPHER_push(st, val) SKM_sk_push(ENGINE_EVP_CIPHER, (st), (val))
-#define sk_ENGINE_EVP_CIPHER_unshift(st, val) SKM_sk_unshift(ENGINE_EVP_CIPHER, (st), (val))
-#define sk_ENGINE_EVP_CIPHER_find(st, val) SKM_sk_find(ENGINE_EVP_CIPHER, (st), (val))
-#define sk_ENGINE_EVP_CIPHER_delete(st, i) SKM_sk_delete(ENGINE_EVP_CIPHER, (st), (i))
-#define sk_ENGINE_EVP_CIPHER_delete_ptr(st, ptr) SKM_sk_delete_ptr(ENGINE_EVP_CIPHER, (st), (ptr))
-#define sk_ENGINE_EVP_CIPHER_insert(st, val, i) SKM_sk_insert(ENGINE_EVP_CIPHER, (st), (val), (i))
-#define sk_ENGINE_EVP_CIPHER_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ENGINE_EVP_CIPHER, (st), (cmp))
-#define sk_ENGINE_EVP_CIPHER_dup(st) SKM_sk_dup(ENGINE_EVP_CIPHER, st)
-#define sk_ENGINE_EVP_CIPHER_pop_free(st, free_func) SKM_sk_pop_free(ENGINE_EVP_CIPHER, (st), (free_func))
-#define sk_ENGINE_EVP_CIPHER_shift(st) SKM_sk_shift(ENGINE_EVP_CIPHER, (st))
-#define sk_ENGINE_EVP_CIPHER_pop(st) SKM_sk_pop(ENGINE_EVP_CIPHER, (st))
-#define sk_ENGINE_EVP_CIPHER_sort(st) SKM_sk_sort(ENGINE_EVP_CIPHER, (st))
+#define sk_ENGINE_new(st) SKM_sk_new(ENGINE, (st))
+#define sk_ENGINE_new_null() SKM_sk_new_null(ENGINE)
+#define sk_ENGINE_free(st) SKM_sk_free(ENGINE, (st))
+#define sk_ENGINE_num(st) SKM_sk_num(ENGINE, (st))
+#define sk_ENGINE_value(st, i) SKM_sk_value(ENGINE, (st), (i))
+#define sk_ENGINE_set(st, i, val) SKM_sk_set(ENGINE, (st), (i), (val))
+#define sk_ENGINE_zero(st) SKM_sk_zero(ENGINE, (st))
+#define sk_ENGINE_push(st, val) SKM_sk_push(ENGINE, (st), (val))
+#define sk_ENGINE_unshift(st, val) SKM_sk_unshift(ENGINE, (st), (val))
+#define sk_ENGINE_find(st, val) SKM_sk_find(ENGINE, (st), (val))
+#define sk_ENGINE_delete(st, i) SKM_sk_delete(ENGINE, (st), (i))
+#define sk_ENGINE_delete_ptr(st, ptr) SKM_sk_delete_ptr(ENGINE, (st), (ptr))
+#define sk_ENGINE_insert(st, val, i) SKM_sk_insert(ENGINE, (st), (val), (i))
+#define sk_ENGINE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ENGINE, (st), (cmp))
+#define sk_ENGINE_dup(st) SKM_sk_dup(ENGINE, st)
+#define sk_ENGINE_pop_free(st, free_func) SKM_sk_pop_free(ENGINE, (st), (free_func))
+#define sk_ENGINE_shift(st) SKM_sk_shift(ENGINE, (st))
+#define sk_ENGINE_pop(st) SKM_sk_pop(ENGINE, (st))
+#define sk_ENGINE_sort(st) SKM_sk_sort(ENGINE, (st))
+
+#define sk_ENGINE_CLEANUP_CB_new(st) SKM_sk_new(ENGINE_CLEANUP_CB, (st))
+#define sk_ENGINE_CLEANUP_CB_new_null() SKM_sk_new_null(ENGINE_CLEANUP_CB)
+#define sk_ENGINE_CLEANUP_CB_free(st) SKM_sk_free(ENGINE_CLEANUP_CB, (st))
+#define sk_ENGINE_CLEANUP_CB_num(st) SKM_sk_num(ENGINE_CLEANUP_CB, (st))
+#define sk_ENGINE_CLEANUP_CB_value(st, i) SKM_sk_value(ENGINE_CLEANUP_CB, (st), (i))
+#define sk_ENGINE_CLEANUP_CB_set(st, i, val) SKM_sk_set(ENGINE_CLEANUP_CB, (st), (i), (val))
+#define sk_ENGINE_CLEANUP_CB_zero(st) SKM_sk_zero(ENGINE_CLEANUP_CB, (st))
+#define sk_ENGINE_CLEANUP_CB_push(st, val) SKM_sk_push(ENGINE_CLEANUP_CB, (st), (val))
+#define sk_ENGINE_CLEANUP_CB_unshift(st, val) SKM_sk_unshift(ENGINE_CLEANUP_CB, (st), (val))
+#define sk_ENGINE_CLEANUP_CB_find(st, val) SKM_sk_find(ENGINE_CLEANUP_CB, (st), (val))
+#define sk_ENGINE_CLEANUP_CB_delete(st, i) SKM_sk_delete(ENGINE_CLEANUP_CB, (st), (i))
+#define sk_ENGINE_CLEANUP_CB_delete_ptr(st, ptr) SKM_sk_delete_ptr(ENGINE_CLEANUP_CB, (st), (ptr))
+#define sk_ENGINE_CLEANUP_CB_insert(st, val, i) SKM_sk_insert(ENGINE_CLEANUP_CB, (st), (val), (i))
+#define sk_ENGINE_CLEANUP_CB_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ENGINE_CLEANUP_CB, (st), (cmp))
+#define sk_ENGINE_CLEANUP_CB_dup(st) SKM_sk_dup(ENGINE_CLEANUP_CB, st)
+#define sk_ENGINE_CLEANUP_CB_pop_free(st, free_func) SKM_sk_pop_free(ENGINE_CLEANUP_CB, (st), (free_func))
+#define sk_ENGINE_CLEANUP_CB_shift(st) SKM_sk_shift(ENGINE_CLEANUP_CB, (st))
+#define sk_ENGINE_CLEANUP_CB_pop(st) SKM_sk_pop(ENGINE_CLEANUP_CB, (st))
+#define sk_ENGINE_CLEANUP_CB_sort(st) SKM_sk_sort(ENGINE_CLEANUP_CB, (st))
 
 #define sk_GENERAL_NAME_new(st) SKM_sk_new(GENERAL_NAME, (st))
 #define sk_GENERAL_NAME_new_null() SKM_sk_new_null(GENERAL_NAME)