Adjust the NID names for the AES modes OFB and CFB to contain the number

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

diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c
index 9d47c8fb8df886d400fe8d1254c708a4bc7d8968..8094c7df95f4da09982e89bbf72b6c5dc12cf9be 100644 (file)
--- a/crypto/objects/obj_dat.c
+++ b/crypto/objects/obj_dat.c
@@ -64,7 +64,7 @@
 #include <openssl/objects.h>
 
 /* obj_dat.h is generated from objects.h by obj_dat.pl */
-#ifndef NO_OBJECT
+#ifndef OPENSSL_NO_OBJECT
 #include "obj_dat.h"
 #else
 /* You will have to load all the objects needed manually in the application */
@@ -176,7 +176,6 @@ static int add_cmp(const void *ca_void, const void *cb_void)
                /* abort(); */
                return 0;
                }
-       return(1); /* should not get here */
        }
 
 static int init_added(void)
@@ -204,13 +203,17 @@ static void cleanup3(ADDED_OBJ *a)
        OPENSSL_free(a);
        }
 
+static IMPLEMENT_LHASH_DOALL_FN(cleanup1, ADDED_OBJ *)
+static IMPLEMENT_LHASH_DOALL_FN(cleanup2, ADDED_OBJ *)
+static IMPLEMENT_LHASH_DOALL_FN(cleanup3, ADDED_OBJ *)
+
 void OBJ_cleanup(void)
        {
        if (added == NULL) return;
        added->down_load=0;
-       lh_doall(added,(LHASH_DOALL_FN_TYPE)cleanup1); /* zero counters */
-       lh_doall(added,(LHASH_DOALL_FN_TYPE)cleanup2); /* set counters */
-       lh_doall(added,(LHASH_DOALL_FN_TYPE)cleanup3); /* free objects */
+       lh_doall(added,LHASH_DOALL_FN(cleanup1)); /* zero counters */
+       lh_doall(added,LHASH_DOALL_FN(cleanup2)); /* set counters */
+       lh_doall(added,LHASH_DOALL_FN(cleanup3)); /* free objects */
        lh_free(added);
        added=NULL;
        }