Check PKCS7 structures in PKCS#12 files are of type data.

[openssl.git] / crypto / engine / tb_cipher.c

diff --git a/crypto/engine/tb_cipher.c b/crypto/engine/tb_cipher.c
index 2716ed7a50fca35edc1a5891848cec50c763eee9..177fc1fb739ae3d8481b1e490da7ebc210e60984 100644 (file)
--- a/crypto/engine/tb_cipher.c
+++ b/crypto/engine/tb_cipher.c
@@ -52,8 +52,6 @@
  *
  */
 
-#include <openssl/evp.h>
-#include <openssl/engine.h>
 #include "eng_int.h"
 
 /* If this symbol is defined then ENGINE_get_cipher_engine(), the function that
@@ -68,7 +66,7 @@ void ENGINE_unregister_ciphers(ENGINE *e)
        engine_table_unregister(&cipher_table, e);
        }
 
-static void engine_unregister_all_ciphers()
+static void engine_unregister_all_ciphers(void)
        {
        engine_table_cleanup(&cipher_table);
        }
@@ -81,7 +79,7 @@ int ENGINE_register_ciphers(ENGINE *e)
                int num_nids = e->ciphers(e, NULL, &nids, 0);
                if(num_nids > 0)
                        return engine_table_register(&cipher_table,
-                                       &engine_unregister_all_ciphers, e, nids,
+                                       engine_unregister_all_ciphers, e, nids,
                                        num_nids, 0);
                }
        return 1;
@@ -103,7 +101,7 @@ int ENGINE_set_default_ciphers(ENGINE *e)
                int num_nids = e->ciphers(e, NULL, &nids, 0);
                if(num_nids > 0)
                        return engine_table_register(&cipher_table,
-                                       &engine_unregister_all_ciphers, e, nids,
+                                       engine_unregister_all_ciphers, e, nids,
                                        num_nids, 1);
                }
        return 1;