-
-
Notifications
You must be signed in to change notification settings - Fork 185
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'github-tlaurion/reproducible_openssl_li…
…btss2_tpm2' PR #1630
- Loading branch information
Showing
8 changed files
with
118 additions
and
52 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| --- ./util/mkbuildinf.pl.orig 2023-02-07 08:43:33.000000000 -0500 | ||
| +++ ./util/mkbuildinf.pl 2024-03-27 14:36:49.974651246 -0400 | ||
| @@ -12,7 +12,7 @@ | ||
| my ($cflags, $platform) = @ARGV; | ||
| $cflags = "compiler: $cflags"; | ||
|
|
||
| -my $date = gmtime($ENV{'SOURCE_DATE_EPOCH'} || time()) . " UTC"; | ||
| +my $date = gmtime($ENV{'SOURCE_DATE_EPOCH'} || '0') . " UTC"; | ||
|
|
||
| print <<"END_OUTPUT"; | ||
| /* | ||
| @@ -36,21 +36,7 @@ | ||
| * literal | ||
| */ | ||
| static const char compiler_flags[] = { | ||
| -END_OUTPUT | ||
| - | ||
| -my $ctr = 0; | ||
| -foreach my $c (split //, $cflags) { | ||
| - $c =~ s|([\\'])|\\$1|; | ||
| - # Max 16 characters per line | ||
| - if (($ctr++ % 16) == 0) { | ||
| - if ($ctr != 1) { | ||
| - print "\n"; | ||
| - } | ||
| - print " "; | ||
| - } | ||
| - print "'$c',"; | ||
| -} | ||
| -print <<"END_OUTPUT"; | ||
| -'\\0' | ||
| + 'r','e','p','r','o','d','u','c','i','b','l','e',' ','b','u','i', | ||
| + 'l','d','\\0' | ||
| }; | ||
| END_OUTPUT |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| --- ./bootstrap.orig 2023-11-08 02:19:36.000000000 -0500 | ||
| +++ ./bootstrap 2024-04-03 12:18:46.722995465 -0400 | ||
| @@ -5,7 +5,7 @@ | ||
|
|
||
| # Generate a VERSION file that is included in the dist tarball to avoid needed git | ||
| # when calling autoreconf in a release tarball. | ||
| -git describe --tags --always --dirty > VERSION | ||
| +#git describe --tags --always --dirty > VERSION | ||
|
|
||
| # generate list of source files for use in Makefile.am | ||
| # if you add new source files, you must run ./bootstrap again | ||
| diff --git a/Makefile.am b/Makefile.am | ||
| index 7132215..32e2193 100644 | ||
| --- a/Makefile.am | ||
| +++ b/Makefile.am | ||
| @@ -93,7 +93,7 @@ tss2_tools = \ | ||
|
|
||
| # Bundle all the tools into a single program similar to busybox | ||
| bin_PROGRAMS += tools/tpm2 | ||
| -tools_tpm2_LDADD = $(LDADD) $(CURL_LIBS) | ||
| +tools_tpm2_LDADD = $(LDADD) | ||
| tools_tpm2_CFLAGS = $(AM_CFLAGS) -DTPM2_TOOLS_MAX="$(words $(tpm2_tools))" | ||
| tools_tpm2_SOURCES = \ | ||
| tools/tpm2_tool.c \ | ||
| @@ -127,7 +127,6 @@ tpm2_tools = \ | ||
| tools/tpm2_encryptdecrypt.c \ | ||
| tools/tpm2_evictcontrol.c \ | ||
| tools/tpm2_flushcontext.c \ | ||
| - tools/tpm2_getekcertificate.c \ | ||
| tools/tpm2_getrandom.c \ | ||
| tools/tpm2_gettime.c \ | ||
| tools/tpm2_hash.c \ | ||
| --- ./configure.ac.orig 2023-11-08 02:19:36.000000000 -0500 | ||
| +++ ./configure.ac 2024-04-02 12:05:00.270985575 -0400 | ||
| @@ -80,7 +80,6 @@ | ||
| AC_CHECK_LIB(crypto, [EVP_sm4_cfb128], [ | ||
| AC_DEFINE([HAVE_EVP_SM4_CFB], [1], [Support EVP_sm4_cfb in openssl])], | ||
| []) | ||
| -PKG_CHECK_MODULES([CURL], [libcurl]) | ||
|
|
||
| # pretty print of devicepath if efivar library is present | ||
| # auto detect if not specified via the --with-efivar option. |
File renamed without changes.