projects / ipfire-3.x.git / blame
| Commit | Line | Data |
|---|---|---|
| 41388a63 MT |
1 | diff -up openssl-1.1.0f/Configurations/unix-Makefile.tmpl.build openssl-1.1.0f/Configurations/unix-Makefile.tmpl |
| 2 | --- openssl-1.1.0f/Configurations/unix-Makefile.tmpl.build 2017-06-02 13:51:39.621289504 +0200 | |
| 3 | +++ openssl-1.1.0f/Configurations/unix-Makefile.tmpl 2017-06-02 13:54:45.298654812 +0200 | |
| 4 | @@ -553,7 +553,7 @@ uninstall_runtime: | |
| 5 | install_man_docs: | |
| 6 | @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) | |
| 7 | @echo "*** Installing manpages" | |
| 8 | - $(PERL) $(SRCDIR)/util/process_docs.pl \ | |
| 9 | + TZ=UTC $(PERL) $(SRCDIR)/util/process_docs.pl \ | |
| 10 | --destdir=$(DESTDIR)$(MANDIR) --type=man --suffix=$(MANSUFFIX) | |
| 11 | ||
| 12 | uninstall_man_docs: | |
| 13 | @@ -565,7 +565,7 @@ uninstall_man_docs: | |
| 14 | install_html_docs: | |
| 15 | @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) | |
| 16 | @echo "*** Installing HTML manpages" | |
| 17 | - $(PERL) $(SRCDIR)/util/process_docs.pl \ | |
| 18 | + TZ=UTC $(PERL) $(SRCDIR)/util/process_docs.pl \ | |
| 19 | --destdir=$(DESTDIR)$(HTMLDIR) --type=html | |
| 20 | ||
| 21 | uninstall_html_docs: | |
| 22 | diff -up openssl-1.1.0f/Configurations/10-main.conf.build openssl-1.1.0f/Configurations/10-main.conf | |
| 23 | --- openssl-1.1.0f/Configurations/10-main.conf.build 2017-05-25 14:46:17.000000000 +0200 | |
| 24 | +++ openssl-1.1.0f/Configurations/10-main.conf 2017-06-02 13:51:39.622289528 +0200 | |
| 25 | @@ -662,6 +662,7 @@ sub vms_info { | |
| 26 | cflags => add("-m64 -DL_ENDIAN"), | |
| 27 | perlasm_scheme => "linux64le", | |
| 28 | shared_ldflag => add("-m64"), | |
| 29 | + multilib => "64", | |
| 30 | }, | |
| 31 | ||
| 32 | "linux-armv4" => { | |
| 33 | @@ -702,6 +703,7 @@ sub vms_info { | |
| 34 | "linux-aarch64" => { | |
| 35 | inherit_from => [ "linux-generic64", asm("aarch64_asm") ], | |
| 36 | perlasm_scheme => "linux64", | |
| 37 | + multilib => "64", | |
| 38 | }, | |
| 39 | "linux-arm64ilp32" => { # https://wiki.linaro.org/Platform/arm64-ilp32 | |
| 40 | inherit_from => [ "linux-generic32", asm("aarch64_asm") ], | |
| 41 | diff -up openssl-1.1.0g/test/evptests.txt.build openssl-1.1.0g/test/evptests.txt | |
| 42 | --- openssl-1.1.0g/test/evptests.txt.build 2017-11-02 15:29:05.000000000 +0100 | |
| 43 | +++ openssl-1.1.0g/test/evptests.txt 2017-11-03 16:37:01.253671494 +0100 | |
| 44 | @@ -3707,14 +3707,6 @@ MCowBQYDK2VuAyEA3p7bfXt9wbTTW2HC7OQ1Nz+D | |
| 45 | ||
| 46 | PrivPubKeyPair = Bob-25519:Bob-25519-PUBLIC | |
| 47 | ||
| 48 | -Derive=Alice-25519 | |
| 49 | -PeerKey=Bob-25519-PUBLIC | |
| 50 | -SharedSecret=4A5D9D5BA4CE2DE1728E3BF480350F25E07E21C947D19E3376F09B3C1E161742 | |
| 51 | - | |
| 52 | -Derive=Bob-25519 | |
| 53 | -PeerKey=Alice-25519-PUBLIC | |
| 54 | -SharedSecret=4A5D9D5BA4CE2DE1728E3BF480350F25E07E21C947D19E3376F09B3C1E161742 | |
| 55 | - | |
| 56 | # Illegal sign/verify operations with X25519 key | |
| 57 | ||
| 58 | Sign=Alice-25519 | |
| 59 | @@ -3727,6 +3719,14 @@ Result = KEYOP_INIT_ERROR | |
| 60 | Function = EVP_PKEY_verify_init | |
| 61 | Reason = operation not supported for this keytype | |
| 62 | ||
| 63 | +Derive=Alice-25519 | |
| 64 | +PeerKey=Bob-25519-PUBLIC | |
| 65 | +SharedSecret=4A5D9D5BA4CE2DE1728E3BF480350F25E07E21C947D19E3376F09B3C1E161742 | |
| 66 | + | |
| 67 | +Derive=Bob-25519 | |
| 68 | +PeerKey=Alice-25519-PUBLIC | |
| 69 | +SharedSecret=4A5D9D5BA4CE2DE1728E3BF480350F25E07E21C947D19E3376F09B3C1E161742 | |
| 70 | + | |
| 71 | ## ECDH Tests: test with randomly generated keys for all the listed curves | |
| 72 | ||
| 73 |