Fix couple gcc 4 warnings, reformat comment.

diff --git a/crypto/dso/dso_dlfcn.c b/crypto/dso/dso_dlfcn.c
index 1f32245eea07473e6beef688fa1cdcfe8ef8460b..d7d40ce32475912b9c0d3f693de5fbabb631cf46 100644 (file)
--- a/crypto/dso/dso_dlfcn.c
+++ b/crypto/dso/dso_dlfcn.c
@@ -232,7 +232,7 @@ static void *dlfcn_bind_var(DSO *dso, const char *symname)
 static DSO_FUNC_TYPE dlfcn_bind_func(DSO *dso, const char *symname)
        {
        void *ptr;
-       DSO_FUNC_TYPE sym;
+       DSO_FUNC_TYPE sym, *tsym = &sym;
 
        if((dso == NULL) || (symname == NULL))
                {
@@ -250,7 +250,7 @@ static DSO_FUNC_TYPE dlfcn_bind_func(DSO *dso, const char *symname)
                DSOerr(DSO_F_DLFCN_BIND_FUNC,DSO_R_NULL_HANDLE);
                return(NULL);
                }
-       *(void**)(&sym) = dlsym(ptr, symname);
+       *(void**)(tsym) = dlsym(ptr, symname);
        if(sym == NULL)
                {
                DSOerr(DSO_F_DLFCN_BIND_FUNC,DSO_R_SYM_FAILURE);

diff --git a/fips/rand/fips_rngvs.c b/fips/rand/fips_rngvs.c
index 2e7053368a98ce16ca99026fec69a0ff8961a55e..a50bfe4bcedf20f5daae2fe0e4d9378b84864ec5 100644 (file)
--- a/fips/rand/fips_rngvs.c
+++ b/fips/rand/fips_rngvs.c
@@ -1,11 +1,12 @@
 /*\r
- * Crude test driver for processing the VST and MCT testvector files generated by the CMVP\r
- * RNGVS product.\r
+ * Crude test driver for processing the VST and MCT testvector files\r
+ * generated by the CMVP RNGVS product.\r
  *\r
- * Note the input files are assumed to have a _very_ specific format as described in the\r
- * NIST document "The Random Number Generator Validation System (RNGVS)", May 25, 2004.\r
+ * Note the input files are assumed to have a _very_ specific format\r
+ * as described in the NIST document "The Random Number Generator\r
+ * Validation System (RNGVS)", May 25, 2004.\r
  *\r
-*/\r
+ */\r
 #include <openssl/opensslconf.h>\r
 \r
 #ifndef OPENSSL_FIPS\r
@@ -13,7 +14,7 @@
 int main()\r
 {\r
     printf("No FIPS RNG support\n");\r
-    exit(0);\r
+    return 0;\r
 }\r
 #else\r
 \r