Use fuzzy search for PHP 7.2 on OpenBSD.

GitOrigin-RevId: d2bb7efbc201666c0e1fe455abc8c69bcf4d782d
u7karshs · Jun 12, 2020 · 7ec6c79 · 7ec6c79
1 parent f6ef851
commit 7ec6c79
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/build.html b/build.html
@@ -515,7 +515,7 @@
     pre_text.push('Note that following calls to <code>pkg</code> needs to be run as <code>root</code>.');
   }
   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 @@
     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
@@ -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
@@ -41,7 +41,6 @@ TEST(Crypto, Aes) {
   CHECK(decrypted != encrypted);
   CHECK(td::crc32(encrypted) == 178892237);
 }
-#endif
 
 TEST(Crypto, AesCtrState) {
   td::vector<td::uint32> 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}) {