mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-01-09 17:38:00 +00:00
fca13a17b1
This applies to all of AES, SHA-1, SHA-256 and SHA-512. All those source files previously contained multiple implementations of the algorithm, enabled or disabled by ifdefs detecting whether they would work on a given compiler. And in order to get advanced machine instructions like AES-NI or NEON crypto into the output file when the compile flags hadn't enabled them, we had to do nasty stuff with compiler-specific pragmas or attributes. Now we can do the detection at cmake time, and enable advanced instructions in the more sensible way, by compile-time flags. So I've broken up each of these modules into lots of sub-pieces: a file called (e.g.) 'foo-common.c' containing common definitions across all implementations (such as round constants), one called 'foo-select.c' containing the top-level vtable(s), and a separate file for each implementation exporting just the vtable(s) for that implementation. One advantage of this is that it depends a lot less on compiler- specific bodgery. My particular least favourite part of the previous setup was the part where I had to _manually_ define some Arm ACLE feature macros before including <arm_neon.h>, so that it would define the intrinsics I wanted. Now I'm enabling interesting architecture features in the normal way, on the compiler command line, there's no need for that kind of trick: the right feature macros are already defined and <arm_neon.h> does the right thing. Another change in this reorganisation is that I've stopped assuming there's just one hardware implementation per platform. Previously, the accelerated vtables were called things like sha256_hw, and varied between FOO-NI and NEON depending on platform; and the selection code would simply ask 'is hw available? if so, use hw, else sw'. Now, each HW acceleration strategy names its vtable its own way, and the selection vtable has a whole list of possibilities to iterate over looking for a supported one. So if someone feels like writing a second accelerated implementation of something for a given platform - for example, I've heard you can use plain NEON to speed up AES somewhat even without the crypto extension - then it will now have somewhere to drop in alongside the existing ones.
45 lines
1.1 KiB
C
45 lines
1.1 KiB
C
/*
|
|
* Top-level vtables to select a SHA-256 implementation.
|
|
*/
|
|
|
|
#include <assert.h>
|
|
#include <stdlib.h>
|
|
|
|
#include "putty.h"
|
|
#include "ssh.h"
|
|
#include "sha256.h"
|
|
|
|
static ssh_hash *sha256_select(const ssh_hashalg *alg)
|
|
{
|
|
static const ssh_hashalg *const real_algs[] = {
|
|
#if HAVE_SHA_NI
|
|
&ssh_sha256_ni,
|
|
#endif
|
|
#if HAVE_NEON_CRYPTO
|
|
&ssh_sha256_neon,
|
|
#endif
|
|
&ssh_sha256_sw,
|
|
NULL,
|
|
};
|
|
|
|
for (size_t i = 0; real_algs[i]; i++) {
|
|
const ssh_hashalg *alg = real_algs[i];
|
|
const struct sha256_extra *alg_extra =
|
|
(const struct sha256_extra *)alg->extra;
|
|
if (check_availability(alg_extra))
|
|
return ssh_hash_new(alg);
|
|
}
|
|
|
|
/* We should never reach the NULL at the end of the list, because
|
|
* the last non-NULL entry should be software-only SHA-256, which
|
|
* is always available. */
|
|
unreachable("sha256_select ran off the end of its list");
|
|
}
|
|
|
|
const ssh_hashalg ssh_sha256 = {
|
|
.new = sha256_select,
|
|
.hlen = 32,
|
|
.blocklen = 64,
|
|
HASHALG_NAMES_ANNOTATED("SHA-256", "dummy selector vtable"),
|
|
};
|