summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/util/mkdef.pl
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/util/mkdef.pl')
-rw-r--r--src/lib/libcrypto/util/mkdef.pl21
1 files changed, 5 insertions, 16 deletions
diff --git a/src/lib/libcrypto/util/mkdef.pl b/src/lib/libcrypto/util/mkdef.pl
index 5ae9ebb619..8ecfde1848 100644
--- a/src/lib/libcrypto/util/mkdef.pl
+++ b/src/lib/libcrypto/util/mkdef.pl
@@ -79,7 +79,7 @@ my $OS2=0;
79my $safe_stack_def = 0; 79my $safe_stack_def = 0;
80 80
81my @known_platforms = ( "__FreeBSD__", "PERL5", "NeXT", 81my @known_platforms = ( "__FreeBSD__", "PERL5", "NeXT",
82 "EXPORT_VAR_AS_FUNCTION", "ZLIB", "OPENSSL_FIPS"); 82 "EXPORT_VAR_AS_FUNCTION", "ZLIB" );
83my @known_ossl_platforms = ( "VMS", "WIN16", "WIN32", "WINNT", "OS2" ); 83my @known_ossl_platforms = ( "VMS", "WIN16", "WIN32", "WINNT", "OS2" );
84my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF", 84my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
85 "CAST", "MD2", "MD4", "MD5", "SHA", "SHA0", "SHA1", 85 "CAST", "MD2", "MD4", "MD5", "SHA", "SHA0", "SHA1",
@@ -102,8 +102,6 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
102 "CMS", 102 "CMS",
103 # CryptoAPI Engine 103 # CryptoAPI Engine
104 "CAPIENG", 104 "CAPIENG",
105 # JPAKE
106 "JPAKE",
107 # Deprecated functions 105 # Deprecated functions
108 "DEPRECATED" ); 106 "DEPRECATED" );
109 107
@@ -124,8 +122,7 @@ my $no_rsa; my $no_dsa; my $no_dh; my $no_hmac=0; my $no_aes; my $no_krb5;
124my $no_ec; my $no_ecdsa; my $no_ecdh; my $no_engine; my $no_hw; my $no_camellia; 122my $no_ec; my $no_ecdsa; my $no_ecdh; my $no_engine; my $no_hw; my $no_camellia;
125my $no_seed; 123my $no_seed;
126my $no_fp_api; my $no_static_engine; my $no_gmp; my $no_deprecated; 124my $no_fp_api; my $no_static_engine; my $no_gmp; my $no_deprecated;
127my $no_rfc3779; my $no_tlsext; my $no_cms; my $no_capieng; my $no_jpake; 125my $no_rfc3779; my $no_tlsext; my $no_cms; my $no_capieng;
128my $fips;
129 126
130 127
131foreach (@ARGV, split(/ /, $options)) 128foreach (@ARGV, split(/ /, $options))
@@ -147,13 +144,12 @@ foreach (@ARGV, split(/ /, $options))
147 } 144 }
148 $VMS=1 if $_ eq "VMS"; 145 $VMS=1 if $_ eq "VMS";
149 $OS2=1 if $_ eq "OS2"; 146 $OS2=1 if $_ eq "OS2";
150 $fips=1 if /^fips/;
151
152 if ($_ eq "zlib" || $_ eq "zlib-dynamic" 147 if ($_ eq "zlib" || $_ eq "zlib-dynamic"
153 || $_ eq "enable-zlib-dynamic") { 148 || $_ eq "enable-zlib-dynamic") {
154 $zlib = 1; 149 $zlib = 1;
155 } 150 }
156 151
152
157 $do_ssl=1 if $_ eq "ssleay"; 153 $do_ssl=1 if $_ eq "ssleay";
158 if ($_ eq "ssl") { 154 if ($_ eq "ssl") {
159 $do_ssl=1; 155 $do_ssl=1;
@@ -213,7 +209,6 @@ foreach (@ARGV, split(/ /, $options))
213 elsif (/^no-tlsext$/) { $no_tlsext=1; } 209 elsif (/^no-tlsext$/) { $no_tlsext=1; }
214 elsif (/^no-cms$/) { $no_cms=1; } 210 elsif (/^no-cms$/) { $no_cms=1; }
215 elsif (/^no-capieng$/) { $no_capieng=1; } 211 elsif (/^no-capieng$/) { $no_capieng=1; }
216 elsif (/^no-jpake$/) { $no_jpake=1; }
217 } 212 }
218 213
219 214
@@ -310,8 +305,6 @@ $crypto.=" crypto/tmdiff.h";
310$crypto.=" crypto/store/store.h"; 305$crypto.=" crypto/store/store.h";
311$crypto.=" crypto/pqueue/pqueue.h"; 306$crypto.=" crypto/pqueue/pqueue.h";
312$crypto.=" crypto/cms/cms.h"; 307$crypto.=" crypto/cms/cms.h";
313$crypto.=" crypto/jpake/jpake.h";
314$crypto.=" fips/fips.h fips/rand/fips_rand.h";
315 308
316my $symhacks="crypto/symhacks.h"; 309my $symhacks="crypto/symhacks.h";
317 310
@@ -1097,9 +1090,6 @@ sub is_valid
1097 if ($keyword eq "EXPORT_VAR_AS_FUNCTION" && ($VMSVAX || $W32 || $W16)) { 1090 if ($keyword eq "EXPORT_VAR_AS_FUNCTION" && ($VMSVAX || $W32 || $W16)) {
1098 return 1; 1091 return 1;
1099 } 1092 }
1100 if ($keyword eq "OPENSSL_FIPS" && $fips) {
1101 return 1;
1102 }
1103 if ($keyword eq "ZLIB" && $zlib) { return 1; } 1093 if ($keyword eq "ZLIB" && $zlib) { return 1; }
1104 return 0; 1094 return 0;
1105 } else { 1095 } else {
@@ -1145,7 +1135,6 @@ sub is_valid
1145 if ($keyword eq "TLSEXT" && $no_tlsext) { return 0; } 1135 if ($keyword eq "TLSEXT" && $no_tlsext) { return 0; }
1146 if ($keyword eq "CMS" && $no_cms) { return 0; } 1136 if ($keyword eq "CMS" && $no_cms) { return 0; }
1147 if ($keyword eq "CAPIENG" && $no_capieng) { return 0; } 1137 if ($keyword eq "CAPIENG" && $no_capieng) { return 0; }
1148 if ($keyword eq "JPAKE" && $no_jpake) { return 0; }
1149 if ($keyword eq "DEPRECATED" && $no_deprecated) { return 0; } 1138 if ($keyword eq "DEPRECATED" && $no_deprecated) { return 0; }
1150 1139
1151 # Nothing recognise as true 1140 # Nothing recognise as true