1 files changed, 152 insertions, 168 deletions

diff --git a/src/lib/libcrypto/dso/dso_dlfcn.c b/src/lib/libcrypto/dso/dso_dlfcn.c
index 648ddb5ac0..245b9b1478 100644
--- a/src/lib/libcrypto/dso/dso_dlfcn.c
+++ b/src/lib/libcrypto/dso/dso_dlfcn.c
@@ -10,7 +10,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -61,10 +61,11 @@
 #include <openssl/dso.h>
 
 #ifndef DSO_DLFCN
-DSO_METHOD *DSO_METHOD_dlfcn(void)
-        {
+DSO_METHOD *
+DSO_METHOD_dlfcn(void)
+{
         return NULL;
-        }
+}
 #else
 
 #ifdef HAVE_DLFCN_H
@@ -87,8 +88,8 @@ static long dlfcn_ctrl(DSO *dso, int cmd, long larg, void *parg);
 #endif
 static char *dlfcn_name_converter(DSO *dso, const char *filename);
 static char *dlfcn_merger(DSO *dso, const char *filespec1,
-        const char *filespec2);
-static int dlfcn_pathbyaddr(void *addr,char *path,int sz);
+    const char *filespec2);
+static int dlfcn_pathbyaddr(void *addr, char *path, int sz);
 static void *dlfcn_globallookup(const char *name);
 
 static DSO_METHOD dso_meth_dlfcn = {
@@ -109,286 +110,269 @@ static DSO_METHOD dso_meth_dlfcn = {
         NULL, /* finish */
         dlfcn_pathbyaddr,
         dlfcn_globallookup
-        };
+};
 
-DSO_METHOD *DSO_METHOD_dlfcn(void)
-        {
-        return(&dso_meth_dlfcn);
-        }
+DSO_METHOD *
+DSO_METHOD_dlfcn(void)
+{
+        return (&dso_meth_dlfcn);
+}
 
 /* For this DSO_METHOD, our meth_data STACK will contain;
  * (i) the handle (void*) returned from dlopen().
  */
 
-static int dlfcn_load(DSO *dso)
-        {
+static int
+dlfcn_load(DSO *dso)
+{
         void *ptr = NULL;
         /* See applicable comments in dso_dl.c */
         char *filename = DSO_convert_filename(dso, NULL);
         int flags = RTLD_LAZY;
 
-        if(filename == NULL)
-                {
-                DSOerr(DSO_F_DLFCN_LOAD,DSO_R_NO_FILENAME);
+        if (filename == NULL) {
+                DSOerr(DSO_F_DLFCN_LOAD, DSO_R_NO_FILENAME);
                 goto err;
-                }
+        }
 
         if (dso->flags & DSO_FLAG_GLOBAL_SYMBOLS)
                 flags |= RTLD_GLOBAL;
         ptr = dlopen(filename, flags);
-        if(ptr == NULL)
-                {
-                DSOerr(DSO_F_DLFCN_LOAD,DSO_R_LOAD_FAILED);
+        if (ptr == NULL) {
+                DSOerr(DSO_F_DLFCN_LOAD, DSO_R_LOAD_FAILED);
                 ERR_add_error_data(4, "filename(", filename, "): ", dlerror());
                 goto err;
-                }
-        if(!sk_void_push(dso->meth_data, (char *)ptr))
-                {
-                DSOerr(DSO_F_DLFCN_LOAD,DSO_R_STACK_ERROR);
+        }
+        if (!sk_void_push(dso->meth_data, (char *)ptr)) {
+                DSOerr(DSO_F_DLFCN_LOAD, DSO_R_STACK_ERROR);
                 goto err;
-                }
+        }
         /* Success */
         dso->loaded_filename = filename;
-        return(1);
+        return (1);
+
 err:
         /* Cleanup! */
-        if(filename != NULL)
+        if (filename != NULL)
                 free(filename);
-        if(ptr != NULL)
+        if (ptr != NULL)
                 dlclose(ptr);
-        return(0);
+        return (0);
 }
 
-static int dlfcn_unload(DSO *dso)
-        {
+static int
+dlfcn_unload(DSO *dso)
+{
         void *ptr;
-        if(dso == NULL)
-                {
-                DSOerr(DSO_F_DLFCN_UNLOAD,ERR_R_PASSED_NULL_PARAMETER);
-                return(0);
-                }
-        if(sk_void_num(dso->meth_data) < 1)
-                return(1);
+        if (dso == NULL) {
+                DSOerr(DSO_F_DLFCN_UNLOAD, ERR_R_PASSED_NULL_PARAMETER);
+                return (0);
+        }
+        if (sk_void_num(dso->meth_data) < 1)
+                return (1);
         ptr = sk_void_pop(dso->meth_data);
-        if(ptr == NULL)
-                {
-                DSOerr(DSO_F_DLFCN_UNLOAD,DSO_R_NULL_HANDLE);
+        if (ptr == NULL) {
+                DSOerr(DSO_F_DLFCN_UNLOAD, DSO_R_NULL_HANDLE);
                 /* Should push the value back onto the stack in
                  * case of a retry. */
                 sk_void_push(dso->meth_data, ptr);
-                return(0);
-                }
+                return (0);
+        }
         /* For now I'm not aware of any errors associated with dlclose() */
         dlclose(ptr);
-        return(1);
-        }
+        return (1);
+}
 
-static void *dlfcn_bind_var(DSO *dso, const char *symname)
-        {
+static void *
+dlfcn_bind_var(DSO *dso, const char *symname)
+{
         void *ptr, *sym;
 
-        if((dso == NULL) || (symname == NULL))
-                {
-                DSOerr(DSO_F_DLFCN_BIND_VAR,ERR_R_PASSED_NULL_PARAMETER);
-                return(NULL);
-                }
-        if(sk_void_num(dso->meth_data) < 1)
-                {
-                DSOerr(DSO_F_DLFCN_BIND_VAR,DSO_R_STACK_ERROR);
-                return(NULL);
-                }
+        if ((dso == NULL) || (symname == NULL)) {
+                DSOerr(DSO_F_DLFCN_BIND_VAR, ERR_R_PASSED_NULL_PARAMETER);
+                return (NULL);
+        }
+        if (sk_void_num(dso->meth_data) < 1) {
+                DSOerr(DSO_F_DLFCN_BIND_VAR, DSO_R_STACK_ERROR);
+                return (NULL);
+        }
         ptr = sk_void_value(dso->meth_data, sk_void_num(dso->meth_data) - 1);
-        if(ptr == NULL)
-                {
-                DSOerr(DSO_F_DLFCN_BIND_VAR,DSO_R_NULL_HANDLE);
-                return(NULL);
-                }
+        if (ptr == NULL) {
+                DSOerr(DSO_F_DLFCN_BIND_VAR, DSO_R_NULL_HANDLE);
+                return (NULL);
+        }
         sym = dlsym(ptr, symname);
-        if(sym == NULL)
-                {
-                DSOerr(DSO_F_DLFCN_BIND_VAR,DSO_R_SYM_FAILURE);
+        if (sym == NULL) {
+                DSOerr(DSO_F_DLFCN_BIND_VAR, DSO_R_SYM_FAILURE);
                 ERR_add_error_data(4, "symname(", symname, "): ", dlerror());
-                return(NULL);
-                }
-        return(sym);
+                return (NULL);
         }
+        return (sym);
+}
 
-static DSO_FUNC_TYPE dlfcn_bind_func(DSO *dso, const char *symname)
-        {
+static DSO_FUNC_TYPE
+dlfcn_bind_func(DSO *dso, const char *symname)
+{
         void *ptr;
         union {
                 DSO_FUNC_TYPE sym;
                 void *dlret;
         } u;
 
-        if((dso == NULL) || (symname == NULL))
-                {
-                DSOerr(DSO_F_DLFCN_BIND_FUNC,ERR_R_PASSED_NULL_PARAMETER);
-                return(NULL);
-                }
-        if(sk_void_num(dso->meth_data) < 1)
-                {
-                DSOerr(DSO_F_DLFCN_BIND_FUNC,DSO_R_STACK_ERROR);
-                return(NULL);
-                }
+        if ((dso == NULL) || (symname == NULL)) {
+                DSOerr(DSO_F_DLFCN_BIND_FUNC, ERR_R_PASSED_NULL_PARAMETER);
+                return (NULL);
+        }
+        if (sk_void_num(dso->meth_data) < 1) {
+                DSOerr(DSO_F_DLFCN_BIND_FUNC, DSO_R_STACK_ERROR);
+                return (NULL);
+        }
         ptr = sk_void_value(dso->meth_data, sk_void_num(dso->meth_data) - 1);
-        if(ptr == NULL)
-                {
-                DSOerr(DSO_F_DLFCN_BIND_FUNC,DSO_R_NULL_HANDLE);
-                return(NULL);
-                }
+        if (ptr == NULL) {
+                DSOerr(DSO_F_DLFCN_BIND_FUNC, DSO_R_NULL_HANDLE);
+                return (NULL);
+        }
         u.dlret = dlsym(ptr, symname);
-        if(u.dlret == NULL)
-                {
-                DSOerr(DSO_F_DLFCN_BIND_FUNC,DSO_R_SYM_FAILURE);
+        if (u.dlret == NULL) {
+                DSOerr(DSO_F_DLFCN_BIND_FUNC, DSO_R_SYM_FAILURE);
                 ERR_add_error_data(4, "symname(", symname, "): ", dlerror());
-                return(NULL);
-                }
-        return u.sym;
+                return (NULL);
         }
+        return u.sym;
+}
 
-static char *dlfcn_merger(DSO *dso, const char *filespec1,
-        const char *filespec2)
-        {
+static char *
+dlfcn_merger(DSO *dso, const char *filespec1, const char *filespec2)
+{
         char *merged;
         size_t len;
 
-        if(!filespec1 && !filespec2)
-                {
+        if (!filespec1 && !filespec2) {
                 DSOerr(DSO_F_DLFCN_MERGER,
-                                ERR_R_PASSED_NULL_PARAMETER);
-                return(NULL);
-                }
+                    ERR_R_PASSED_NULL_PARAMETER);
+                return (NULL);
+        }
         /* If the first file specification is a rooted path, it rules.
            same goes if the second file specification is missing. */
-        if (!filespec2 || (filespec1 != NULL && filespec1[0] == '/'))
-                {
+        if (!filespec2 || (filespec1 != NULL && filespec1[0] == '/')) {
                 len = strlen(filespec1) + 1;
                 merged = malloc(len);
-                if(!merged)
-                        {
+                if (!merged) {
                         DSOerr(DSO_F_DLFCN_MERGER, ERR_R_MALLOC_FAILURE);
-                        return(NULL);
-                        }
-                strlcpy(merged, filespec1, len);
+                        return (NULL);
                 }
+                strlcpy(merged, filespec1, len);
+        }
         /* If the first file specification is missing, the second one rules. */
-        else if (!filespec1)
-                {
+        else if (!filespec1) {
                 len = strlen(filespec2) + 1;
                 merged = malloc(strlen(filespec2) + 1);
-                if(!merged)
-                        {
-                        DSOerr(DSO_F_DLFCN_MERGER,
-                                ERR_R_MALLOC_FAILURE);
-                        return(NULL);
-                        }
-                strlcpy(merged, filespec2, len);
+                if (!merged) {
+                        DSOerr(DSO_F_DLFCN_MERGER, ERR_R_MALLOC_FAILURE);
+                        return (NULL);
                 }
-        else
+                strlcpy(merged, filespec2, len);
+        } else
                 /* This part isn't as trivial as it looks.  It assumes that
                    the second file specification really is a directory, and
                    makes no checks whatsoever.  Therefore, the result becomes
                    the concatenation of filespec2 followed by a slash followed
                    by filespec1. */
-                {
+        {
                 int spec2len, len;
 
                 spec2len = strlen(filespec2);
                 len = spec2len + (filespec1 ? strlen(filespec1) : 0);
 
-                if(filespec2 && filespec2[spec2len - 1] == '/')
-                        {
+                if (filespec2 && filespec2[spec2len - 1] == '/') {
                         spec2len--;
                         len--;
-                        }
+                }
                 merged = malloc(len + 2);
-                if(!merged)
-                        {
-                        DSOerr(DSO_F_DLFCN_MERGER,
-                                ERR_R_MALLOC_FAILURE);
-                        return(NULL);
-                        }
+                if (!merged) {
+                        DSOerr(DSO_F_DLFCN_MERGER, ERR_R_MALLOC_FAILURE);
+                        return (NULL);
+                }
                 strlcpy(merged, filespec2, len + 2);
                 merged[spec2len] = '/';
                 strlcpy(&merged[spec2len + 1], filespec1, len + 1 - spec2len);
-                }
-        return(merged);
         }
+        return (merged);
+}
 
 #define DSO_ext ".so"
 #define DSO_extlen 3
 
-static char *dlfcn_name_converter(DSO *dso, const char *filename)
-        {
+static char *
+dlfcn_name_converter(DSO *dso, const char *filename)
+{
         char *translated;
         int len, rsize, transform;
 
         len = strlen(filename);
         rsize = len + 1;
         transform = (strstr(filename, "/") == NULL);
-        if(transform)
-                {
+        if (transform) {
                 /* We will convert this to "%s.so" or "lib%s.so" etc */
                 rsize += DSO_extlen;    /* The length of ".so" */
                 if ((DSO_flags(dso) & DSO_FLAG_NAME_TRANSLATION_EXT_ONLY) == 0)
                         rsize += 3; /* The length of "lib" */
-                }
+        }
         translated = malloc(rsize);
-        if(translated == NULL)
-                {
+        if (translated == NULL) {
                 DSOerr(DSO_F_DLFCN_NAME_CONVERTER,
-                                DSO_R_NAME_TRANSLATION_FAILED);
-                return(NULL);
-                }
-        if(transform)
-                {
+                    DSO_R_NAME_TRANSLATION_FAILED);
+                return (NULL);
+        }
+        if (transform) {
                 if ((DSO_flags(dso) & DSO_FLAG_NAME_TRANSLATION_EXT_ONLY) == 0)
                         snprintf(translated, rsize, "lib%s" DSO_ext, filename);
                 else
                         snprintf(translated, rsize, "%s" DSO_ext, filename);
-                }
-        else
+        } else
                 snprintf(translated, rsize, "%s", filename);
-        return(translated);
-        }
+        return (translated);
+}
 
-static int dlfcn_pathbyaddr(void *addr,char *path,int sz)
-        {
+static int
+dlfcn_pathbyaddr(void *addr, char *path, int sz)
+{
         Dl_info dli;
         int len;
 
-        if (addr == NULL)
-                {
-                union   { int(*f)(void*,char*,int); void *p; } t =
-                        { dlfcn_pathbyaddr };
+        if (addr == NULL) {
+                union{
+                        int(*f)(void*, char*, int);
+                        void *p;
+                } t = { dlfcn_pathbyaddr };
                 addr = t.p;
-                }
+        }
 
-        if (dladdr(addr,&dli))
-                {
+        if (dladdr(addr, &dli)) {
                 len = (int)strlen(dli.dli_fname);
-                if (sz <= 0) return len+1;
-                if (len >= sz) len=sz-1;
-                memcpy(path,dli.dli_fname,len);
-                path[len++]=0;
+                if (sz <= 0)
+                        return len + 1;
+                if (len >= sz)
+                        len = sz - 1;
+                memcpy(path, dli.dli_fname, len);
+                path[len++] = 0;
                 return len;
-                }
+        }
 
         ERR_add_error_data(4, "dlfcn_pathbyaddr(): ", dlerror());
         return -1;
-        }
+}
 
-static void *dlfcn_globallookup(const char *name)
-        {
-        void *ret = NULL,*handle = dlopen(NULL,RTLD_LAZY);
-        
-        if (handle)
-                {
-                ret = dlsym(handle,name);
+static void *
+dlfcn_globallookup(const char *name)
+{
+        void *ret = NULL, *handle = dlopen(NULL, RTLD_LAZY);
+
+        if (handle) {
+                ret = dlsym(handle, name);
                 dlclose(handle);
-                }
+        }
 
         return ret;
-        }
+}
 #endif /* DSO_DLFCN */