diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-06-12 17:38:36 +0200 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-06-12 17:38:36 +0200 |
| commit | 19cd2049f77805d66856eee2a6b4df2ec8169b16 (patch) | |
| tree | ec7eb01b4ad5e9b23d1cc855ea29cb30512663bc /util/mkdef.pl | |
| parent | Use FIPSCAPABLE for FIPS module functions used in FIPS capable OpenSSL. (diff) | |
| download | openssl-19cd2049f77805d66856eee2a6b4df2ec8169b16.tar.xz openssl-19cd2049f77805d66856eee2a6b4df2ec8169b16.zip | |
Don't export functions marked as FIPSCAPABLE.
Diffstat (limited to '')
| -rwxr-xr-x | util/mkdef.pl | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/util/mkdef.pl b/util/mkdef.pl index b87b1106e3..696365d08a 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -79,7 +79,8 @@ my $OS2=0; my $safe_stack_def = 0; my @known_platforms = ( "__FreeBSD__", "PERL5", "NeXT", - "EXPORT_VAR_AS_FUNCTION", "ZLIB", "OPENSSL_FIPS" ); + "EXPORT_VAR_AS_FUNCTION", "ZLIB", + "OPENSSL_FIPS", "OPENSSL_FIPSCAPABLE" ); my @known_ossl_platforms = ( "VMS", "WIN16", "WIN32", "WINNT", "OS2" ); my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF", "CAST", "MD2", "MD4", "MD5", "SHA", "SHA0", "SHA1", @@ -1136,6 +1137,9 @@ sub is_valid if ($keyword eq "EXPORT_VAR_AS_FUNCTION" && ($VMSVAX || $W32 || $W16)) { return 1; } + if ($keyword eq "OPENSSL_FIPSCAPABLE") { + return 0; + } if ($keyword eq "OPENSSL_FIPS" && $fips) { return 1; } @@ -1484,6 +1488,7 @@ sub update_numbers next if defined($rsyms{$sym}); die "ERROR: Symbol $sym had no info attached to it." if $i eq ""; + next if $i =~ /OPENSSL_FIPSCAPABLE/; if (!exists $nums{$s}) { $new_syms++; my $s2 = $s; |