nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-23 15:09:24 -05:00
Code Issues Projects Releases Wiki Activity

Merge miscellaneous fixes from 'pre-0.78'.

Browse Source
This commit is contained in:
Simon Tatham 2022-10-12 20:02:09 +01:00
commit 85014f82c1
4 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/cmake.h.in
View File

@ -54,6 +54,7 @@
#cmakedefine01 HAVE_CLMUL #cmakedefine01 HAVE_CLMUL
#cmakedefine01 HAVE_NEON_CRYPTO #cmakedefine01 HAVE_NEON_CRYPTO
#cmakedefine01 HAVE_NEON_PMULL #cmakedefine01 HAVE_NEON_PMULL
#cmakedefine01 HAVE_NEON_VADDQ_P128
#cmakedefine01 HAVE_NEON_SHA512 #cmakedefine01 HAVE_NEON_SHA512
#cmakedefine01 HAVE_NEON_SHA512_INTRINSICS #cmakedefine01 HAVE_NEON_SHA512_INTRINSICS
#cmakedefine01 USE_ARM64_NEON_H #cmakedefine01 USE_ARM64_NEON_H

8
crypto/CMakeLists.txt
View File

@ -195,6 +195,14 @@ if(neon)
int main(void) { r = vmull_p64(a, b); r = vmull_high_p64(u, v); }" int main(void) { r = vmull_p64(a, b); r = vmull_high_p64(u, v); }"
ADD_SOURCES_IF_SUCCESSFUL aesgcm-neon.c) ADD_SOURCES_IF_SUCCESSFUL aesgcm-neon.c)
test_compile_with_flags(HAVE_NEON_VADDQ_P128
GNU_FLAGS -march=armv8-a+crypto
MSVC_FLAGS -D_ARM_USE_NEW_NEON_INTRINSICS
TEST_SOURCE "
#include <${neon_header}>
volatile poly128_t r;
int main(void) { r = vaddq_p128(r, r); }")
# The 'sha3' architecture extension, despite the name, includes # The 'sha3' architecture extension, despite the name, includes
# support for SHA-512 (from the SHA-2 standard) as well as SHA-3 # support for SHA-512 (from the SHA-2 standard) as well as SHA-3
# proper. # proper.

8
crypto/aesgcm-neon.c
View File

@ -87,6 +87,14 @@ static inline void store_p128_be(void *p, poly128_t v)
vst1q_u8(p, vrev64q_u8(vreinterpretq_u8_p128(swapped))); vst1q_u8(p, vrev64q_u8(vreinterpretq_u8_p128(swapped)));
} }
#if !HAVE_NEON_VADDQ_P128
static inline poly128_t vaddq_p128(poly128_t a, poly128_t b)
{
return vreinterpretq_p128_u32(veorq_u32(
vreinterpretq_u32_p128(a), vreinterpretq_u32_p128(b)));
}
#endif
/* /*
* Key setup is just like in aesgcm-ref-poly.c. There's no point using * Key setup is just like in aesgcm-ref-poly.c. There's no point using
* vector registers to accelerate this, because it happens rarely. * vector registers to accelerate this, because it happens rarely.

9
windows/installer.wxs
View File

@ -121,12 +121,6 @@
Language="1033" Codepage="1252" Version="$(var.Winver)"> Language="1033" Codepage="1252" Version="$(var.Winver)">
<!-- <!--
We force the install scope to perMachine, largely because I
don't really understand how to make it usefully switchable
between the two. If anyone is a WiX expert and does want to
install PuTTY locally in a user account, I hope they'll send a
well explained patch!
$(var.Puttytextver) is again defined on the candle command $(var.Puttytextver) is again defined on the candle command
line, and describes the version of PuTTY in human-readable line, and describes the version of PuTTY in human-readable
form, e.g. "PuTTY 0.67" or "PuTTY development snapshot [foo]". form, e.g. "PuTTY 0.67" or "PuTTY development snapshot [foo]".
@ -135,8 +129,7 @@
Description="$(var.Puttytextver) installer" Description="$(var.Puttytextver) installer"
Manufacturer="Simon Tatham" Manufacturer="Simon Tatham"
InstallerVersion="$(var.InstallerVersion)" Languages="1033" InstallerVersion="$(var.InstallerVersion)" Languages="1033"
Compressed="yes" SummaryCodepage="1252" Compressed="yes" SummaryCodepage="1252" />
InstallScope="perMachine" />
<!-- <!--
Permit installing an arbitrary one of these PuTTY installers Permit installing an arbitrary one of these PuTTY installers