Make binary curve ASN.1 work in FIPS mode.

[oweals/openssl.git] / crypto / dso / dso_lib.c

diff --git a/crypto/dso/dso_lib.c b/crypto/dso/dso_lib.c
index 8330c7d3876b29b7c7a8eb8576ce719bad016694..8a15b794abef2b2d5c97040e6c49c19638a8fb82 100644 (file)
--- a/crypto/dso/dso_lib.c
+++ b/crypto/dso/dso_lib.c
@@ -107,7 +107,7 @@ DSO *DSO_new_method(DSO_METHOD *meth)
                return(NULL);
                }
        memset(ret, 0, sizeof(DSO));
-       ret->meth_data = sk_new_null();
+       ret->meth_data = sk_void_new_null();
        if(ret->meth_data == NULL)
                {
                /* sk_new doesn't generate any errors so we do */
@@ -163,7 +163,7 @@ int DSO_free(DSO *dso)
                return(0);
                }
        
-       sk_free(dso->meth_data);
+       sk_void_free(dso->meth_data);
        if(dso->filename != NULL)
                OPENSSL_free(dso->filename);
        if(dso->loaded_filename != NULL)
@@ -289,7 +289,6 @@ DSO_FUNC_TYPE DSO_bind_func(DSO *dso, const char *symname)
                DSOerr(DSO_F_DSO_BIND_FUNC,DSO_R_UNSUPPORTED);
                return(NULL);
                }
-fprintf(stderr,"boo\n");
        if((ret = dso->meth->dso_bind_func(dso, symname)) == NULL)
                {
                DSOerr(DSO_F_DSO_BIND_FUNC,DSO_R_SYM_FAILURE);
@@ -400,13 +399,6 @@ char *DSO_merge(DSO *dso, const char *filespec1, const char *filespec2)
                DSOerr(DSO_F_DSO_MERGE,ERR_R_PASSED_NULL_PARAMETER);
                return(NULL);
                }
-       if(filespec1 == NULL)
-               filespec1 = dso->filename;
-       if(filespec1 == NULL)
-               {
-               DSOerr(DSO_F_DSO_MERGE,DSO_R_NO_FILE_SPECIFICATION);
-               return(NULL);
-               }
        if((dso->flags & DSO_FLAG_NO_NAME_TRANSLATION) == 0)
                {
                if(dso->merger != NULL)
@@ -472,27 +464,19 @@ int DSO_pathbyaddr(void *addr,char *path,int sz)
        if (meth == NULL) meth = DSO_METHOD_openssl();
        if (meth->pathbyaddr == NULL)
                {
-               DSOerr(DSO_F_PATHBYADDR,DSO_R_UNSUPPORTED);
+               DSOerr(DSO_F_DSO_PATHBYADDR,DSO_R_UNSUPPORTED);
                return -1;
                }
        return (*meth->pathbyaddr)(addr,path,sz);
        }
 
-/* This function should be used with caution! It looks up symbols in
- * *all* loaded modules and if module gets unloaded by somebody else
- * attempt to dereference the pointer is doomed to have fatal
- * consequences. Primary usage for this function is to probe *core*
- * system functionality, e.g. check if getnameinfo(3) is available
- * at run-time without bothering about OS-specific details such as
- * libc.so.versioning or where does it actually reside: in libc
- * itself or libsocket. */
-DSO_FUNC_TYPE DSO_global_lookup_func(const char *name)
+void *DSO_global_lookup(const char *name)
        {
        DSO_METHOD *meth = default_DSO_meth;
        if (meth == NULL) meth = DSO_METHOD_openssl();
        if (meth->globallookup == NULL)
                {
-               DSOerr(DSO_F_GLOBAL_LOOKUP_FUNC,DSO_R_UNSUPPORTED);
+               DSOerr(DSO_F_DSO_GLOBAL_LOOKUP,DSO_R_UNSUPPORTED);
                return NULL;
                }
        return (*meth->globallookup)(name);