From 7ec6c794f8624bf0e5e588c7e713acbfaef234d8 Mon Sep 17 00:00:00 2001 From: levlam Date: Fri, 12 Jun 2020 22:08:44 +0300 Subject: [PATCH] Use fuzzy search for PHP 7.2 on OpenBSD. GitOrigin-RevId: d2bb7efbc201666c0e1fe455abc8c69bcf4d782d --- build.html | 4 ++-- tdutils/td/utils/crypto.cpp | 3 ++- tdutils/test/crypto.cpp | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build.html b/build.html index 0c458fcd7..f7644a4cf 100644 --- a/build.html +++ b/build.html @@ -515,7 +515,7 @@ function onOptionsChanged() { pre_text.push('Note that following calls to pkg needs to be run as root.'); } if (os_openbsd) { - pre_text.push('Note that following instruction is for OpenBSD 6.4 and default KSH shell.'); + pre_text.push('Note that following instruction is for OpenBSD 6.7 and default KSH shell.'); } if (os_netbsd) { pre_text.push('Note that following instruction is for NetBSD 8.0 and default SH shell.'); @@ -648,7 +648,7 @@ function onOptionsChanged() { if (target === 'JNI') { packages += ' jdk'; } - commands.push('pkg_add ' + packages); + commands.push('pkg_add -z ' + packages); if (!use_root) { commands.push('exit'); } diff --git a/tdutils/td/utils/crypto.cpp b/tdutils/td/utils/crypto.cpp index 4ea55e184..175bb79f6 100644 --- a/tdutils/td/utils/crypto.cpp +++ b/tdutils/td/utils/crypto.cpp @@ -15,6 +15,7 @@ #include "td/utils/port/thread_local.h" #include "td/utils/Random.h" #include "td/utils/ScopeGuard.h" +#include "td/utils/SharedSlice.h" #include "td/utils/StackAllocator.h" #include "td/utils/StringBuilder.h" @@ -405,7 +406,7 @@ class AesCtrState::Impl { static constexpr size_t N = 32; SecureString counter{AES_BLOCK_SIZE * N}; SecureString encrypted_counter{AES_BLOCK_SIZE * N}; - td::Slice current; + Slice current; void inc(uint8 *ptr) { for (int j = 15; j >= 0; j--) { diff --git a/tdutils/test/crypto.cpp b/tdutils/test/crypto.cpp index dc68c63d0..306206d63 100644 --- a/tdutils/test/crypto.cpp +++ b/tdutils/test/crypto.cpp @@ -41,7 +41,6 @@ TEST(Crypto, Aes) { CHECK(decrypted != encrypted); CHECK(td::crc32(encrypted) == 178892237); } -#endif TEST(Crypto, AesCtrState) { td::vector answers1{0u, 1141589763u, 596296607u, 3673001485u, 2302125528u, @@ -88,6 +87,7 @@ TEST(Crypto, AesCtrState) { i++; } } +#endif TEST(Crypto, Sha256State) { for (auto length : {0, 1, 31, 32, 33, 9999, 10000, 10001, 999999, 1000001}) {