Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Nettle
nettle
Commits
c02493e5
Commit
c02493e5
authored
Mar 11, 2018
by
Niels Möller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support sha_ni sha256_compress in x86_64 fat builds.
parent
34ea00b4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
85 additions
and
0 deletions
+85
-0
ChangeLog
ChangeLog
+7
-0
fat-x86_64.c
fat-x86_64.c
+10
-0
x86_64/fat/sha256-compress-2.asm
x86_64/fat/sha256-compress-2.asm
+34
-0
x86_64/fat/sha256-compress.asm
x86_64/fat/sha256-compress.asm
+34
-0
No files found.
ChangeLog
View file @
c02493e5
2018-03-11 Niels Möller <nisse@lysator.liu.se>
* x86_64/fat/sha256-compress.asm: New file.
* x86_64/fat/sha256-compress-2.asm: New file.
* fat-x86_64.c (fat_init): Select plain x86_64 assembly version or
sha_ni version for sha256_compress.
2018-02-21 Niels Möller <nisse@lysator.liu.se>
* x86_64/sha_ni/sha256-compress.asm: New implementation using sha_ni
...
...
fat-x86_64.c
View file @
c02493e5
...
...
@@ -127,6 +127,10 @@ DECLARE_FAT_FUNC(_nettle_sha1_compress, sha1_compress_func)
DECLARE_FAT_FUNC_VAR
(
sha1_compress
,
sha1_compress_func
,
x86_64
)
DECLARE_FAT_FUNC_VAR
(
sha1_compress
,
sha1_compress_func
,
sha_ni
)
DECLARE_FAT_FUNC
(
_nettle_sha256_compress
,
sha256_compress_func
)
DECLARE_FAT_FUNC_VAR
(
sha256_compress
,
sha256_compress_func
,
x86_64
)
DECLARE_FAT_FUNC_VAR
(
sha256_compress
,
sha256_compress_func
,
sha_ni
)
/* This function should usually be called only once, at startup. But
it is idempotent, and on x86, pointer updates are atomic, so
there's no danger if it is called simultaneously from multiple
...
...
@@ -172,12 +176,14 @@ fat_init (void)
if
(
verbose
)
fprintf
(
stderr
,
"libnettle: using sha_ni instructions.
\n
"
);
_nettle_sha1_compress_vec
=
_nettle_sha1_compress_sha_ni
;
_nettle_sha256_compress_vec
=
_nettle_sha256_compress_sha_ni
;
}
else
{
if
(
verbose
)
fprintf
(
stderr
,
"libnettle: not using sha_ni instructions.
\n
"
);
_nettle_sha1_compress_vec
=
_nettle_sha1_compress_x86_64
;
_nettle_sha256_compress_vec
=
_nettle_sha256_compress_x86_64
;
}
if
(
features
.
vendor
==
X86_INTEL
)
{
...
...
@@ -214,3 +220,7 @@ DEFINE_FAT_FUNC(nettle_memxor, void *,
DEFINE_FAT_FUNC
(
_nettle_sha1_compress
,
void
,
(
uint32_t
*
state
,
const
uint8_t
*
input
),
(
state
,
input
))
DEFINE_FAT_FUNC
(
_nettle_sha256_compress
,
void
,
(
uint32_t
*
state
,
const
uint8_t
*
input
,
const
uint32_t
*
k
),
(
state
,
input
,
k
))
x86_64/fat/sha256-compress-2.asm
0 → 100644
View file @
c02493e5
C
x86_64
/
fat
/
sha256
-
compress
-
2
.asm
ifelse
(
<
Copyright
(
C
)
2018
Niels
M
ö
ller
This
file
is
part
of
GNU
Nettle.
GNU
Nettle
is
free
software
:
you
can
redistribute
it
and
/
or
modify
it
under
the
terms
of
either
:
*
the
GNU
Lesser
General
Public
License
as
published
by
the
Free
Software
Foundation
; either version 3 of the License, or (at your
option
)
any
later
version.
or
*
the
GNU
General
Public
License
as
published
by
the
Free
Software
Foundation
; either version 2 of the License, or (at your
option
)
any
later
version.
or
both
in
parallel
,
as
here.
GNU
Nettle
is
di
stributed
in
the
hope
that
it
will
be
useful
,
but
WITHOUT
ANY
WARRANTY
; without even the implied warranty of
MERCHANTABILITY
or
FITNESS
FOR
A
PARTICULAR
PURPOSE.
See
the
GNU
General
Public
License
for
more
details.
You
should
have
received
copies
of
the
GNU
General
Public
License
and
the
GNU
Lesser
General
Public
License
al
ong
with
this
program.
If
not
,
see
http
:
//
www.gnu.org
/
licenses
/
.
>)
define
(
<
fat_transform
>
,
<
$
1
_sha_ni
>
)
include_src
(
<
x86_64
/
sha_ni
/
sha256
-
compress.asm
>
)
x86_64/fat/sha256-compress.asm
0 → 100644
View file @
c02493e5
C
x86_64
/
fat
/
sha256
-
compress.asm
ifelse
(
<
Copyright
(
C
)
2018
Niels
M
ö
ller
This
file
is
part
of
GNU
Nettle.
GNU
Nettle
is
free
software
:
you
can
redistribute
it
and
/
or
modify
it
under
the
terms
of
either
:
*
the
GNU
Lesser
General
Public
License
as
published
by
the
Free
Software
Foundation
; either version 3 of the License, or (at your
option
)
any
later
version.
or
*
the
GNU
General
Public
License
as
published
by
the
Free
Software
Foundation
; either version 2 of the License, or (at your
option
)
any
later
version.
or
both
in
parallel
,
as
here.
GNU
Nettle
is
di
stributed
in
the
hope
that
it
will
be
useful
,
but
WITHOUT
ANY
WARRANTY
; without even the implied warranty of
MERCHANTABILITY
or
FITNESS
FOR
A
PARTICULAR
PURPOSE.
See
the
GNU
General
Public
License
for
more
details.
You
should
have
received
copies
of
the
GNU
General
Public
License
and
the
GNU
Lesser
General
Public
License
al
ong
with
this
program.
If
not
,
see
http
:
//
www.gnu.org
/
licenses
/
.
>)
define
(
<
fat_transform
>
,
<
$
1
_x86_64
>
)
include_src
(
<
x86_64
/
sha256
-
compress.asm
>
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment