X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=test%2Fgenerate_ssl_tests.pl;h=cdb35cc1500fbc5f0d5cb660afb52fa2c685d494;hb=HEAD;hp=580bfb5e7028fa806daa9efd31fe32cde636ec50;hpb=ab5a02f70726e28b3c39391aac29a4aedb080ea3;p=oweals%2Fopenssl.git diff --git a/test/generate_ssl_tests.pl b/test/generate_ssl_tests.pl index 580bfb5e70..cdb35cc150 100644 --- a/test/generate_ssl_tests.pl +++ b/test/generate_ssl_tests.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the Apache License 2.0 (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -128,18 +128,13 @@ sub print_templates { sub read_config { my $fname = shift; my $provider = shift; - my $fips_mode = "0"; - my $no_deflt_libctx = "0"; - - $fips_mode = "1" if $provider eq "fips"; - $no_deflt_libctx = "1" if $provider eq "default" || $provider eq "fips"; + local $ssltests::fips_mode = $provider eq "fips"; + local $ssltests::no_deflt_libctx = + $provider eq "default" || $provider eq "fips"; open(INPUT, "< $fname") or die "Can't open input file '$fname'!\n"; local $/ = undef; my $content = ; - $content =~ s/FIPS_MODE/$fips_mode/g; - $content =~ s/NO_DEFLT_LIBCTX/$no_deflt_libctx/g; - close(INPUT); eval $content; warn $@ if $@;