Use "resp" for default directory name for .rsp files.

[openssl.git] / fips / fips_utl.h

diff --git a/fips/fips_utl.h b/fips/fips_utl.h
index dc29c20ce37d5731b24bced7d14b91605f5f4827..899422f438a33514871b5da2d256bb570d5bccc9 100644 (file)
--- a/fips/fips_utl.h
+++ b/fips/fips_utl.h
@@ -58,6 +58,7 @@ int do_hex2bn(BIGNUM **pr, const char *in);
 int do_bn_print(FILE *out, const BIGNUM *bn);
 int do_bn_print_name(FILE *out, const char *name, const BIGNUM *bn);
 int parse_line(char **pkw, char **pval, char *linebuf, char *olinebuf);
+int parse_line2(char **pkw, char **pval, char *linebuf, char *olinebuf, int eol);
 BIGNUM *hex2bn(const char *in);
 int tidy_line(char *linebuf, char *olinebuf);
 int bint2bin(const char *in, int len, unsigned char *out);
@@ -136,7 +137,7 @@ void do_entropy_stick(void)
 void fips_algtest_init(void)
        {
        fips_algtest_init_nofips();
-       if (!FIPS_mode_set(1))
+       if (!FIPS_module_mode_set(1))
                {
                fprintf(stderr, "Error entering FIPS mode\n");
                exit(1);
@@ -261,6 +262,11 @@ int do_bn_print_name(FILE *out, const char *name, const BIGNUM *bn)
        }
 
 int parse_line(char **pkw, char **pval, char *linebuf, char *olinebuf)
+       {
+       return parse_line2(pkw, pval, linebuf, olinebuf, 1);
+       }
+
+int parse_line2(char **pkw, char **pval, char *linebuf, char *olinebuf, int eol)
        {
        char *keyword, *value, *p, *q;
        strcpy(linebuf, olinebuf);
@@ -292,7 +298,7 @@ int parse_line(char **pkw, char **pval, char *linebuf, char *olinebuf)
        /* Remove trailing space from value */
        p = value + strlen(value) - 1;
 
-       if (*p != '\n')
+       if (eol && *p != '\n')
                fprintf(stderr, "Warning: missing EOL\n");
 
        while (*p == '\n' || isspace((unsigned char)*p))