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
e6df06c6
Commit
e6df06c6
authored
Dec 26, 2018
by
Niels Möller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
New header file pkcs1-internal.h
parent
fc30c4d8
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
69 additions
and
20 deletions
+69
-20
ChangeLog
ChangeLog
+10
-0
Makefile.in
Makefile.in
+1
-1
pkcs1-decrypt.c
pkcs1-decrypt.c
+1
-1
pkcs1-internal.h
pkcs1-internal.h
+53
-0
pkcs1-sec-decrypt.c
pkcs1-sec-decrypt.c
+1
-2
rsa-decrypt-tr.c
rsa-decrypt-tr.c
+1
-0
rsa-internal.h
rsa-internal.h
+0
-14
rsa-sec-decrypt.c
rsa-sec-decrypt.c
+1
-0
testsuite/pkcs1-sec-decrypt-test.c
testsuite/pkcs1-sec-decrypt-test.c
+1
-2
No files found.
ChangeLog
View file @
e6df06c6
2018-12-26 Niels Möller <nisse@lysator.liu.se>
* pkcs1-internal.h: New header file, moved declarations of
_pkcs1_sec_decrypt and _pkcs1_sec_decrypt_variable here.
* rsa-internal.h: ... old location.
* Makefile.in (DISTFILES): Added pkcs1-internal.h.
* pkcs1-decrypt.c: Include new file.
* pkcs1-sec-decrypt.c: Likewise.
* rsa-decrypt-tr.c: Likewise.
* rsa-sec-decrypt.c: Likewise.
* testsuite/pkcs1-sec-decrypt-test.c: Likewise.
* tools/nettle-pbkdf2.c: Add #define _GNU_SOURCE, needed for
strdup with gcc -std=c89.
* testsuite/ed25519-test.c: Add #define _GNU_SOURCE, needed for
...
...
Makefile.in
View file @
e6df06c6
...
...
@@ -234,7 +234,7 @@ DISTFILES = $(SOURCES) $(HEADERS) getopt.h getopt_int.h \
memxor-internal.h nettle-internal.h nettle-write.h
\
ctr-internal.h chacha-internal.h sha3-internal.h
\
salsa20-internal.h umac-internal.h hogweed-internal.h
\
rsa-internal.h dsa-internal.h eddsa-internal.h
\
rsa-internal.h
pkcs1-internal.h
dsa-internal.h eddsa-internal.h
\
gmp-glue.h ecc-internal.h fat-setup.h
\
mini-gmp.h asm.m4
\
nettle.texinfo nettle.info nettle.html nettle.pdf sha-example.c
...
...
pkcs1-decrypt.c
View file @
e6df06c6
...
...
@@ -38,10 +38,10 @@
#include <string.h>
#include "pkcs1.h"
#include "pkcs1-internal.h"
#include "bignum.h"
#include "gmp-glue.h"
#include "rsa-internal.h"
int
pkcs1_decrypt
(
size_t
key_size
,
...
...
pkcs1-internal.h
0 → 100644
View file @
e6df06c6
/* pkcs1-internal.h
Copyright (C) 2018 Niels Möller
Copyright (C) 2018 Red Hat, Inc.
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 distributed 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 along with this program. If
not, see http://www.gnu.org/licenses/.
*/
#ifndef NETTLE_PKCS1_INTERNAL_H_INCLUDED
#define NETTLE_PKCS1_INTERNAL_H_INCLUDED
#include "nettle-types.h"
#define _pkcs1_sec_decrypt _nettle_pkcs1_sec_decrypt
#define _pkcs1_sec_decrypt_variable _nettle_pkcs1_sec_decrypt_variable
/* additional resistance to memory access side-channel attacks.
* Note: message buffer is returned unchanged on error */
int
_pkcs1_sec_decrypt
(
size_t
length
,
uint8_t
*
message
,
size_t
padded_message_length
,
const
volatile
uint8_t
*
padded_message
);
int
_pkcs1_sec_decrypt_variable
(
size_t
*
length
,
uint8_t
*
message
,
size_t
padded_message_length
,
const
volatile
uint8_t
*
padded_message
);
#endif
/* NETTLE_PKCS1_INTERNAL_H_INCLUDED */
pkcs1-sec-decrypt.c
View file @
e6df06c6
...
...
@@ -43,8 +43,7 @@
#include "memops.h"
#include "gmp-glue.h"
#include "rsa.h"
#include "rsa-internal.h"
#include "pkcs1-internal.h"
/* Inputs are always cast to uint32_t values. But all values used in this
* function should never exceed the maximum value of a uint32_t anyway.
...
...
rsa-decrypt-tr.c
View file @
e6df06c6
...
...
@@ -37,6 +37,7 @@
#endif
#include "rsa-internal.h"
#include "pkcs1-internal.h"
#include "gmp-glue.h"
int
...
...
rsa-internal.h
View file @
e6df06c6
...
...
@@ -44,8 +44,6 @@
#define _rsa_sec_compute_root_itch _nettle_rsa_sec_compute_root_itch
#define _rsa_sec_compute_root _nettle_rsa_sec_compute_root
#define _rsa_sec_compute_root_tr _nettle_rsa_sec_compute_root_tr
#define _pkcs1_sec_decrypt _nettle_pkcs1_sec_decrypt
#define _pkcs1_sec_decrypt_variable _nettle_pkcs1_sec_decrypt_variable
/* Internal functions. */
int
...
...
@@ -87,16 +85,4 @@ _rsa_sec_compute_root_tr(const struct rsa_public_key *pub,
void
*
random_ctx
,
nettle_random_func
*
random
,
mp_limb_t
*
x
,
const
mp_limb_t
*
m
,
size_t
mn
);
/* additional resistance to memory access side-channel attacks.
* Note: message buffer is returned unchanged on error */
int
_pkcs1_sec_decrypt
(
size_t
length
,
uint8_t
*
message
,
size_t
padded_message_length
,
const
volatile
uint8_t
*
padded_message
);
int
_pkcs1_sec_decrypt_variable
(
size_t
*
length
,
uint8_t
*
message
,
size_t
padded_message_length
,
const
volatile
uint8_t
*
padded_message
);
#endif
/* NETTLE_RSA_INTERNAL_H_INCLUDED */
rsa-sec-decrypt.c
View file @
e6df06c6
...
...
@@ -39,6 +39,7 @@
#endif
#include "rsa.h"
#include "pkcs1-internal.h"
#include "rsa-internal.h"
#include "gmp-glue.h"
...
...
testsuite/pkcs1-sec-decrypt-test.c
View file @
e6df06c6
#include "testutils.h"
#include "rsa.h"
#include "rsa-internal.h"
#include "pkcs1-internal.h"
#if HAVE_VALGRIND_MEMCHECK_H
# include <valgrind/memcheck.h>
...
...
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