KNF.

1 files changed, 274 insertions, 288 deletions

diff --git a/src/lib/libcrypto/dso/dso_lib.c b/src/lib/libcrypto/dso/dso_lib.c
index 2f77242d47..1ee4e45dce 100644
--- a/src/lib/libcrypto/dso/dso_lib.c
+++ b/src/lib/libcrypto/dso/dso_lib.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
@@ -63,230 +63,223 @@
 
 static DSO_METHOD *default_DSO_meth = NULL;
 
-DSO *DSO_new(void)
-        {
-        return(DSO_new_method(NULL));
-        }
+DSO *
+DSO_new(void)
+{
+        return (DSO_new_method(NULL));
+}
 
-void DSO_set_default_method(DSO_METHOD *meth)
-        {
+void
+DSO_set_default_method(DSO_METHOD *meth)
+{
         default_DSO_meth = meth;
-        }
-
-DSO_METHOD *DSO_get_default_method(void)
-        {
-        return(default_DSO_meth);
-        }
-
-DSO_METHOD *DSO_get_method(DSO *dso)
-        {
-        return(dso->meth);
-        }
-
-DSO_METHOD *DSO_set_method(DSO *dso, DSO_METHOD *meth)
-        {
+}
+
+DSO_METHOD *
+DSO_get_default_method(void)
+{
+        return (default_DSO_meth);
+}
+
+DSO_METHOD *
+DSO_get_method(DSO *dso)
+{
+        return (dso->meth);
+}
+
+DSO_METHOD *
+DSO_set_method(DSO *dso, DSO_METHOD *meth)
+{
         DSO_METHOD *mtmp;
+
         mtmp = dso->meth;
         dso->meth = meth;
-        return(mtmp);
-        }
+        return (mtmp);
+}
 
-DSO *DSO_new_method(DSO_METHOD *meth)
-        {
+DSO *
+DSO_new_method(DSO_METHOD *meth)
+{
         DSO *ret;
 
-        if(default_DSO_meth == NULL)
+        if (default_DSO_meth == NULL)
                 /* We default to DSO_METH_openssl() which in turn defaults
                  * to stealing the "best available" method. Will fallback
                  * to DSO_METH_null() in the worst case. */
                 default_DSO_meth = DSO_METHOD_openssl();
         ret = (DSO *)malloc(sizeof(DSO));
-        if(ret == NULL)
-                {
-                DSOerr(DSO_F_DSO_NEW_METHOD,ERR_R_MALLOC_FAILURE);
-                return(NULL);
-                }
+        if (ret == NULL) {
+                DSOerr(DSO_F_DSO_NEW_METHOD, ERR_R_MALLOC_FAILURE);
+                return (NULL);
+        }
         memset(ret, 0, sizeof(DSO));
         ret->meth_data = sk_void_new_null();
-        if(ret->meth_data == NULL)
-                {
+        if (ret->meth_data == NULL) {
                 /* sk_new doesn't generate any errors so we do */
-                DSOerr(DSO_F_DSO_NEW_METHOD,ERR_R_MALLOC_FAILURE);
+                DSOerr(DSO_F_DSO_NEW_METHOD, ERR_R_MALLOC_FAILURE);
                 free(ret);
-                return(NULL);
-                }
-        if(meth == NULL)
+                return (NULL);
+        }
+        if (meth == NULL)
                 ret->meth = default_DSO_meth;
         else
                 ret->meth = meth;
         ret->references = 1;
-        if((ret->meth->init != NULL) && !ret->meth->init(ret))
-                {
+        if ((ret->meth->init != NULL) && !ret->meth->init(ret)) {
                 free(ret);
-                ret=NULL;
-                }
-        return(ret);
+                ret = NULL;
         }
+        return (ret);
+}
 
-int DSO_free(DSO *dso)
-        {
-        int i;
- 
-        if(dso == NULL)
-                {
-                DSOerr(DSO_F_DSO_FREE,ERR_R_PASSED_NULL_PARAMETER);
-                return(0);
-                }
- 
-        i=CRYPTO_add(&dso->references,-1,CRYPTO_LOCK_DSO);
-        if(i > 0) return(1);
-
-        if((dso->meth->dso_unload != NULL) && !dso->meth->dso_unload(dso))
-                {
-                DSOerr(DSO_F_DSO_FREE,DSO_R_UNLOAD_FAILED);
-                return(0);
-                }
- 
-        if((dso->meth->finish != NULL) && !dso->meth->finish(dso))
-                {
-                DSOerr(DSO_F_DSO_FREE,DSO_R_FINISH_FAILED);
-                return(0);
-                }
-        
-        sk_void_free(dso->meth_data);
-        if(dso->filename != NULL)
-                free(dso->filename);
-        if(dso->loaded_filename != NULL)
-                free(dso->loaded_filename);
- 
-        free(dso);
-        return(1);
+int
+DSO_free(DSO *dso)
+{
+        int i;
+
+        if (dso == NULL) {
+                DSOerr(DSO_F_DSO_FREE, ERR_R_PASSED_NULL_PARAMETER);
+                return (0);
         }
 
-int DSO_flags(DSO *dso)
-        {
-        return((dso == NULL) ? 0 : dso->flags);
+        i = CRYPTO_add(&dso->references, -1, CRYPTO_LOCK_DSO);
+        if (i > 0)
+                return (1);
+
+        if ((dso->meth->dso_unload != NULL) && !dso->meth->dso_unload(dso)) {
+                DSOerr(DSO_F_DSO_FREE, DSO_R_UNLOAD_FAILED);
+                return (0);
         }
 
+        if ((dso->meth->finish != NULL) && !dso->meth->finish(dso)) {
+                DSOerr(DSO_F_DSO_FREE, DSO_R_FINISH_FAILED);
+                return (0);
+        }
 
-int DSO_up_ref(DSO *dso)
-        {
-        if (dso == NULL)
-                {
-                DSOerr(DSO_F_DSO_UP_REF,ERR_R_PASSED_NULL_PARAMETER);
-                return(0);
-                }
+        sk_void_free(dso->meth_data);
+        if (dso->filename != NULL)
+                free(dso->filename);
+        if (dso->loaded_filename != NULL)
+                free(dso->loaded_filename);
 
-        CRYPTO_add(&dso->references,1,CRYPTO_LOCK_DSO);
-        return(1);
+        free(dso);
+        return (1);
+}
+
+int
+DSO_flags(DSO *dso)
+{
+        return ((dso == NULL) ? 0 : dso->flags);
+}
+
+
+int
+DSO_up_ref(DSO *dso)
+{
+        if (dso == NULL) {
+                DSOerr(DSO_F_DSO_UP_REF, ERR_R_PASSED_NULL_PARAMETER);
+                return (0);
         }
 
-DSO *DSO_load(DSO *dso, const char *filename, DSO_METHOD *meth, int flags)
-        {
+        CRYPTO_add(&dso->references, 1, CRYPTO_LOCK_DSO);
+        return (1);
+}
+
+DSO *
+DSO_load(DSO *dso, const char *filename, DSO_METHOD *meth, int flags)
+{
         DSO *ret;
         int allocated = 0;
 
-        if(dso == NULL)
-                {
+        if (dso == NULL) {
                 ret = DSO_new_method(meth);
-                if(ret == NULL)
-                        {
-                        DSOerr(DSO_F_DSO_LOAD,ERR_R_MALLOC_FAILURE);
+                if (ret == NULL) {
+                        DSOerr(DSO_F_DSO_LOAD, ERR_R_MALLOC_FAILURE);
                         goto err;
-                        }
+                }
                 allocated = 1;
                 /* Pass the provided flags to the new DSO object */
-                if(DSO_ctrl(ret, DSO_CTRL_SET_FLAGS, flags, NULL) < 0)
-                        {
-                        DSOerr(DSO_F_DSO_LOAD,DSO_R_CTRL_FAILED);
+                if (DSO_ctrl(ret, DSO_CTRL_SET_FLAGS, flags, NULL) < 0) {
+                        DSOerr(DSO_F_DSO_LOAD, DSO_R_CTRL_FAILED);
                         goto err;
-                        }
                 }
-        else
+        } else
                 ret = dso;
         /* Don't load if we're currently already loaded */
-        if(ret->filename != NULL)
-                {
-                DSOerr(DSO_F_DSO_LOAD,DSO_R_DSO_ALREADY_LOADED);
+        if (ret->filename != NULL) {
+                DSOerr(DSO_F_DSO_LOAD, DSO_R_DSO_ALREADY_LOADED);
                 goto err;
-                }
+        }
         /* filename can only be NULL if we were passed a dso that already has
          * one set. */
-        if(filename != NULL)
-                if(!DSO_set_filename(ret, filename))
-                        {
-                        DSOerr(DSO_F_DSO_LOAD,DSO_R_SET_FILENAME_FAILED);
-                        goto err;
-                        }
+        if (filename != NULL)
+                if (!DSO_set_filename(ret, filename)) {
+                DSOerr(DSO_F_DSO_LOAD, DSO_R_SET_FILENAME_FAILED);
+                goto err;
+        }
         filename = ret->filename;
-        if(filename == NULL)
-                {
-                DSOerr(DSO_F_DSO_LOAD,DSO_R_NO_FILENAME);
+        if (filename == NULL) {
+                DSOerr(DSO_F_DSO_LOAD, DSO_R_NO_FILENAME);
                 goto err;
-                }
-        if(ret->meth->dso_load == NULL)
-                {
-                DSOerr(DSO_F_DSO_LOAD,DSO_R_UNSUPPORTED);
+        }
+        if (ret->meth->dso_load == NULL) {
+                DSOerr(DSO_F_DSO_LOAD, DSO_R_UNSUPPORTED);
                 goto err;
-                }
-        if(!ret->meth->dso_load(ret))
-                {
-                DSOerr(DSO_F_DSO_LOAD,DSO_R_LOAD_FAILED);
+        }
+        if (!ret->meth->dso_load(ret)) {
+                DSOerr(DSO_F_DSO_LOAD, DSO_R_LOAD_FAILED);
                 goto err;
-                }
+        }
         /* Load succeeded */
-        return(ret);
+        return (ret);
+
 err:
-        if(allocated)
+        if (allocated)
                 DSO_free(ret);
-        return(NULL);
-        }
+        return (NULL);
+}
 
-void *DSO_bind_var(DSO *dso, const char *symname)
-        {
+void *
+DSO_bind_var(DSO *dso, const char *symname)
+{
         void *ret = NULL;
 
-        if((dso == NULL) || (symname == NULL))
-                {
-                DSOerr(DSO_F_DSO_BIND_VAR,ERR_R_PASSED_NULL_PARAMETER);
-                return(NULL);
-                }
-        if(dso->meth->dso_bind_var == NULL)
-                {
-                DSOerr(DSO_F_DSO_BIND_VAR,DSO_R_UNSUPPORTED);
-                return(NULL);
-                }
-        if((ret = dso->meth->dso_bind_var(dso, symname)) == NULL)
-                {
-                DSOerr(DSO_F_DSO_BIND_VAR,DSO_R_SYM_FAILURE);
-                return(NULL);
-                }
-        /* Success */
-        return(ret);
+        if ((dso == NULL) || (symname == NULL)) {
+                DSOerr(DSO_F_DSO_BIND_VAR, ERR_R_PASSED_NULL_PARAMETER);
+                return (NULL);
+        }
+        if (dso->meth->dso_bind_var == NULL) {
+                DSOerr(DSO_F_DSO_BIND_VAR, DSO_R_UNSUPPORTED);
+                return (NULL);
         }
+        if ((ret = dso->meth->dso_bind_var(dso, symname)) == NULL) {
+                DSOerr(DSO_F_DSO_BIND_VAR, DSO_R_SYM_FAILURE);
+                return (NULL);
+        }
+        /* Success */
+        return (ret);
+}
 
-DSO_FUNC_TYPE DSO_bind_func(DSO *dso, const char *symname)
-        {
+DSO_FUNC_TYPE
+DSO_bind_func(DSO *dso, const char *symname)
+{
         DSO_FUNC_TYPE ret = NULL;
 
-        if((dso == NULL) || (symname == NULL))
-                {
-                DSOerr(DSO_F_DSO_BIND_FUNC,ERR_R_PASSED_NULL_PARAMETER);
-                return(NULL);
-                }
-        if(dso->meth->dso_bind_func == NULL)
-                {
-                DSOerr(DSO_F_DSO_BIND_FUNC,DSO_R_UNSUPPORTED);
-                return(NULL);
-                }
-        if((ret = dso->meth->dso_bind_func(dso, symname)) == NULL)
-                {
-                DSOerr(DSO_F_DSO_BIND_FUNC,DSO_R_SYM_FAILURE);
-                return(NULL);
-                }
-        /* Success */
-        return(ret);
+        if ((dso == NULL) || (symname == NULL)) {
+                DSOerr(DSO_F_DSO_BIND_FUNC, ERR_R_PASSED_NULL_PARAMETER);
+                return (NULL);
         }
+        if (dso->meth->dso_bind_func == NULL) {
+                DSOerr(DSO_F_DSO_BIND_FUNC, DSO_R_UNSUPPORTED);
+                return (NULL);
+        }
+        if ((ret = dso->meth->dso_bind_func(dso, symname)) == NULL) {
+                DSOerr(DSO_F_DSO_BIND_FUNC, DSO_R_SYM_FAILURE);
+                return (NULL);
+        }
+        /* Success */
+        return (ret);
+}
 
 /* I don't really like these *_ctrl functions very much to be perfectly
  * honest. For one thing, I think I have to return a negative value for
@@ -296,178 +289,171 @@ DSO_FUNC_TYPE DSO_bind_func(DSO *dso, const char *symname)
  * odd times. I'd prefer "output" values to be passed by reference and
  * the return value as success/failure like usual ... but we conform
  * when we must... :-) */
-long DSO_ctrl(DSO *dso, int cmd, long larg, void *parg)
-        {
-        if(dso == NULL)
-                {
-                DSOerr(DSO_F_DSO_CTRL,ERR_R_PASSED_NULL_PARAMETER);
-                return(-1);
-                }
+long
+DSO_ctrl(DSO *dso, int cmd, long larg, void *parg)
+{
+        if (dso == NULL) {
+                DSOerr(DSO_F_DSO_CTRL, ERR_R_PASSED_NULL_PARAMETER);
+                return (-1);
+        }
         /* We should intercept certain generic commands and only pass control
          * to the method-specific ctrl() function if it's something we don't
          * handle. */
-        switch(cmd)
-                {
+        switch (cmd) {
         case DSO_CTRL_GET_FLAGS:
                 return dso->flags;
         case DSO_CTRL_SET_FLAGS:
                 dso->flags = (int)larg;
-                return(0);
+                return (0);
         case DSO_CTRL_OR_FLAGS:
                 dso->flags |= (int)larg;
-                return(0);
+                return (0);
         default:
                 break;
-                }
-        if((dso->meth == NULL) || (dso->meth->dso_ctrl == NULL))
-                {
-                DSOerr(DSO_F_DSO_CTRL,DSO_R_UNSUPPORTED);
-                return(-1);
-                }
-        return(dso->meth->dso_ctrl(dso,cmd,larg,parg));
         }
-
-int DSO_set_name_converter(DSO *dso, DSO_NAME_CONVERTER_FUNC cb,
-                        DSO_NAME_CONVERTER_FUNC *oldcb)
-        {
-        if(dso == NULL)
-                {
+        if ((dso->meth == NULL) || (dso->meth->dso_ctrl == NULL)) {
+                DSOerr(DSO_F_DSO_CTRL, DSO_R_UNSUPPORTED);
+                return (-1);
+        }
+        return (dso->meth->dso_ctrl(dso, cmd, larg, parg));
+}
+
+int
+DSO_set_name_converter(DSO *dso, DSO_NAME_CONVERTER_FUNC cb,
+    DSO_NAME_CONVERTER_FUNC *oldcb)
+{
+        if (dso == NULL) {
                 DSOerr(DSO_F_DSO_SET_NAME_CONVERTER,
-                                ERR_R_PASSED_NULL_PARAMETER);
-                return(0);
-                }
-        if(oldcb)
+                    ERR_R_PASSED_NULL_PARAMETER);
+                return (0);
+        }
+        if (oldcb)
                 *oldcb = dso->name_converter;
         dso->name_converter = cb;
-        return(1);
-        }
-
-const char *DSO_get_filename(DSO *dso)
-        {
-        if(dso == NULL)
-                {
-                DSOerr(DSO_F_DSO_GET_FILENAME,ERR_R_PASSED_NULL_PARAMETER);
-                return(NULL);
-                }
-        return(dso->filename);
+        return (1);
+}
+
+const char *
+DSO_get_filename(DSO *dso)
+{
+        if (dso == NULL) {
+                DSOerr(DSO_F_DSO_GET_FILENAME, ERR_R_PASSED_NULL_PARAMETER);
+                return (NULL);
         }
+        return (dso->filename);
+}
 
-int DSO_set_filename(DSO *dso, const char *filename)
-        {
+int
+DSO_set_filename(DSO *dso, const char *filename)
+{
         char *copied;
 
-        if((dso == NULL) || (filename == NULL))
-                {
-                DSOerr(DSO_F_DSO_SET_FILENAME,ERR_R_PASSED_NULL_PARAMETER);
-                return(0);
-                }
-        if(dso->loaded_filename)
-                {
-                DSOerr(DSO_F_DSO_SET_FILENAME,DSO_R_DSO_ALREADY_LOADED);
-                return(0);
-                }
+        if ((dso == NULL) || (filename == NULL)) {
+                DSOerr(DSO_F_DSO_SET_FILENAME, ERR_R_PASSED_NULL_PARAMETER);
+                return (0);
+        }
+        if (dso->loaded_filename) {
+                DSOerr(DSO_F_DSO_SET_FILENAME, DSO_R_DSO_ALREADY_LOADED);
+                return (0);
+        }
         /* We'll duplicate filename */
         copied = malloc(strlen(filename) + 1);
-        if(copied == NULL)
-                {
-                DSOerr(DSO_F_DSO_SET_FILENAME,ERR_R_MALLOC_FAILURE);
-                return(0);
-                }
+        if (copied == NULL) {
+                DSOerr(DSO_F_DSO_SET_FILENAME, ERR_R_MALLOC_FAILURE);
+                return (0);
+        }
         strlcpy(copied, filename, strlen(filename) + 1);
-        if(dso->filename)
+        if (dso->filename)
                 free(dso->filename);
         dso->filename = copied;
-        return(1);
-        }
+        return (1);
+}
 
-char *DSO_merge(DSO *dso, const char *filespec1, const char *filespec2)
-        {
+char *
+DSO_merge(DSO *dso, const char *filespec1, const char *filespec2)
+{
         char *result = NULL;
 
-        if(dso == NULL || filespec1 == NULL)
-                {
-                DSOerr(DSO_F_DSO_MERGE,ERR_R_PASSED_NULL_PARAMETER);
-                return(NULL);
-                }
-        if((dso->flags & DSO_FLAG_NO_NAME_TRANSLATION) == 0)
-                {
-                if(dso->merger != NULL)
+        if (dso == NULL || filespec1 == NULL) {
+                DSOerr(DSO_F_DSO_MERGE, ERR_R_PASSED_NULL_PARAMETER);
+                return (NULL);
+        }
+        if ((dso->flags & DSO_FLAG_NO_NAME_TRANSLATION) == 0) {
+                if (dso->merger != NULL)
                         result = dso->merger(dso, filespec1, filespec2);
-                else if(dso->meth->dso_merger != NULL)
+                else if (dso->meth->dso_merger != NULL)
                         result = dso->meth->dso_merger(dso,
-                                filespec1, filespec2);
-                }
-        return(result);
+                            filespec1, filespec2);
         }
+        return (result);
+}
 
-char *DSO_convert_filename(DSO *dso, const char *filename)
-        {
+char *
+DSO_convert_filename(DSO *dso, const char *filename)
+{
         char *result = NULL;
 
-        if(dso == NULL)
-                {
-                DSOerr(DSO_F_DSO_CONVERT_FILENAME,ERR_R_PASSED_NULL_PARAMETER);
-                return(NULL);
-                }
-        if(filename == NULL)
+        if (dso == NULL) {
+                DSOerr(DSO_F_DSO_CONVERT_FILENAME, ERR_R_PASSED_NULL_PARAMETER);
+                return (NULL);
+        }
+        if (filename == NULL)
                 filename = dso->filename;
-        if(filename == NULL)
-                {
-                DSOerr(DSO_F_DSO_CONVERT_FILENAME,DSO_R_NO_FILENAME);
-                return(NULL);
-                }
-        if((dso->flags & DSO_FLAG_NO_NAME_TRANSLATION) == 0)
-                {
-                if(dso->name_converter != NULL)
+        if (filename == NULL) {
+                DSOerr(DSO_F_DSO_CONVERT_FILENAME, DSO_R_NO_FILENAME);
+                return (NULL);
+        }
+        if ((dso->flags & DSO_FLAG_NO_NAME_TRANSLATION) == 0) {
+                if (dso->name_converter != NULL)
                         result = dso->name_converter(dso, filename);
-                else if(dso->meth->dso_name_converter != NULL)
+                else if (dso->meth->dso_name_converter != NULL)
                         result = dso->meth->dso_name_converter(dso, filename);
-                }
-        if(result == NULL)
-                {
+        }
+        if (result == NULL) {
                 result = malloc(strlen(filename) + 1);
-                if(result == NULL)
-                        {
+                if (result == NULL) {
                         DSOerr(DSO_F_DSO_CONVERT_FILENAME,
-                                        ERR_R_MALLOC_FAILURE);
-                        return(NULL);
-                        }
-                strlcpy(result, filename, strlen(filename) + 1);
+                            ERR_R_MALLOC_FAILURE);
+                        return (NULL);
                 }
-        return(result);
+                strlcpy(result, filename, strlen(filename) + 1);
         }
+        return (result);
+}
 
-const char *DSO_get_loaded_filename(DSO *dso)
-        {
-        if(dso == NULL)
-                {
+const char *
+DSO_get_loaded_filename(DSO *dso)
+{
+        if (dso == NULL) {
                 DSOerr(DSO_F_DSO_GET_LOADED_FILENAME,
-                                ERR_R_PASSED_NULL_PARAMETER);
-                return(NULL);
-                }
-        return(dso->loaded_filename);
+                    ERR_R_PASSED_NULL_PARAMETER);
+                return (NULL);
         }
+        return (dso->loaded_filename);
+}
 
-int DSO_pathbyaddr(void *addr,char *path,int sz)
-        {
+int
+DSO_pathbyaddr(void *addr, char *path, int sz)
+{
         DSO_METHOD *meth = default_DSO_meth;
-        if (meth == NULL) meth = DSO_METHOD_openssl();
-        if (meth->pathbyaddr == NULL)
-                {
-                DSOerr(DSO_F_DSO_PATHBYADDR,DSO_R_UNSUPPORTED);
+        if (meth == NULL)
+                meth = DSO_METHOD_openssl();
+        if (meth->pathbyaddr == NULL) {
+                DSOerr(DSO_F_DSO_PATHBYADDR, DSO_R_UNSUPPORTED);
                 return -1;
-                }
-        return (*meth->pathbyaddr)(addr,path,sz);
         }
+        return (*meth->pathbyaddr)(addr, path, sz);
+}
 
-void *DSO_global_lookup(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_DSO_GLOBAL_LOOKUP,DSO_R_UNSUPPORTED);
+        if (meth == NULL)
+                meth = DSO_METHOD_openssl();
+        if (meth->globallookup == NULL) {
+                DSOerr(DSO_F_DSO_GLOBAL_LOOKUP, DSO_R_UNSUPPORTED);
                 return NULL;
-                }
-        return (*meth->globallookup)(name);
         }
+        return (*meth->globallookup)(name);
+}