projects
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
b08e372
)
Don't export functions marked as FIPSCAPABLE.
author
Dr. Stephen Henson
<steve@openssl.org>
Sun, 12 Jun 2011 15:38:36 +0000
(15:38 +0000)
committer
Dr. Stephen Henson
<steve@openssl.org>
Sun, 12 Jun 2011 15:38:36 +0000
(15:38 +0000)
util/mkdef.pl
patch
|
blob
|
history
diff --git
a/util/mkdef.pl
b/util/mkdef.pl
index b87b1106e36957a51e5426f9dfa7d77be4acc0dd..696365d08afbb38b6b710a86115087127b79bdeb 100755
(executable)
--- 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",
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",
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 "EXPORT_VAR_AS_FUNCTION" && ($VMSVAX || $W32 || $W16)) {
return 1;
}
+ if ($keyword eq "OPENSSL_FIPSCAPABLE") {
+ return 0;
+ }
if ($keyword eq "OPENSSL_FIPS" && $fips) {
return 1;
}
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 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;
if (!exists $nums{$s}) {
$new_syms++;
my $s2 = $s;