fclose streams in fips_drbvs.c

Produced error message for unsupported curves in fips_ecdhvs.c

diff --git a/fips/ecdh/fips_ecdhvs.c b/fips/ecdh/fips_ecdhvs.c
index a30e335e2b9fddf35ab476ee1e56f32858af714c..099285aac3d9961385a284b8a94dd48d1093a7cf 100644 (file)
--- a/fips/ecdh/fips_ecdhvs.c
+++ b/fips/ecdh/fips_ecdhvs.c
@@ -413,6 +413,11 @@ int main(int argc, char **argv)
                        if (group)
                                EC_GROUP_free(group);
                        group = EC_GROUP_new_by_curve_name(nid);
+                       if (!group)
+                               {
+                               fprintf(stderr, "ERROR: unsupported curve %s\n", buf + 1);
+                               return 1;
+                               }
                        }
 
                if (strlen(buf) > 6 && !strncmp(buf, "[E", 2))

diff --git a/fips/rand/fips_drbgvs.c b/fips/rand/fips_drbgvs.c
index bcdfa6dac3533a6353527a13aea10465378c84ff..9aae88c3e164b40360b82a15505d35b2abfc89dd 100644 (file)
--- a/fips/rand/fips_drbgvs.c
+++ b/fips/rand/fips_drbgvs.c
@@ -176,7 +176,7 @@ int fips_drbgvs_main(int argc,char **argv)
 int main(int argc,char **argv)
 #endif
        {
-       FILE *in, *out;
+       FILE *in = NULL, *out = NULL;
        DRBG_CTX *dctx = NULL;
        TEST_ENT t;
        int r, nid = 0;
@@ -406,6 +406,10 @@ int main(int argc,char **argv)
                        }
 
                }
+       if (in && in != stdin)
+               fclose(in);
+       if (out && out != stdout)
+               fclose(out);
        return 0;
        }