Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Nettle
nettle
Commits
4a4201f9
Commit
4a4201f9
authored
Jun 25, 2012
by
Niels Möller
Browse files
Renamed pkcs1_signature_prefix to _pkcs1_signature_prefix.
parent
ba98962d
Changes
10
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
4a4201f9
2012-06-25 Niels Möller <nisse@lysator.liu.se>
* pkcs1.c (_pkcs1_signature_prefix): Renamed function, adding a
leading underscore. Updated all callers.
* bignum-next-prime.c (nettle_next_prime): Consistently use the
type nettle_random_func * (rather then just nettle_random_func)
when passing the function pointer as argument. Similar change for
...
...
NEWS
View file @
4a4201f9
...
...
@@ -4,9 +4,11 @@ NEWS for the 2.5 release
and MacOS. There are also a few new features.
* Warning: The undocumented, internal, function
pkcs1_signature_prefix is changed. Since this is an internal
function, this is not considered a change of ABI or API.
Programs explicitly using this function will break.
pkcs1_signature_prefix has been renamed to
_pkcs1_signature_prefix, and with slightly different
behavior. Since this is an internal function, this is not
considered a change of ABI or API. Programs explicitly using
this function will break.
New features:
...
...
pkcs1-rsa-digest.c
View file @
4a4201f9
...
...
@@ -38,8 +38,8 @@ pkcs1_rsa_digest_encode(mpz_t m, unsigned key_size,
TMP_DECL
(
em
,
uint8_t
,
NETTLE_MAX_BIGNUM_SIZE
);
TMP_ALLOC
(
em
,
key_size
);
if
(
pkcs1_signature_prefix
(
key_size
,
em
,
di_length
,
digest_info
,
0
))
if
(
_
pkcs1_signature_prefix
(
key_size
,
em
,
di_length
,
digest_info
,
0
))
{
nettle_mpz_set_str_256_u
(
m
,
key_size
,
em
);
return
1
;
...
...
pkcs1-rsa-md5.c
View file @
4a4201f9
...
...
@@ -68,10 +68,10 @@ pkcs1_rsa_md5_encode(mpz_t m, unsigned key_size, struct md5_ctx *hash)
TMP_DECL
(
em
,
uint8_t
,
NETTLE_MAX_BIGNUM_SIZE
);
TMP_ALLOC
(
em
,
key_size
);
p
=
pkcs1_signature_prefix
(
key_size
,
em
,
sizeof
(
md5_prefix
),
md5_prefix
,
MD5_DIGEST_SIZE
);
p
=
_
pkcs1_signature_prefix
(
key_size
,
em
,
sizeof
(
md5_prefix
),
md5_prefix
,
MD5_DIGEST_SIZE
);
if
(
p
)
{
md5_digest
(
hash
,
MD5_DIGEST_SIZE
,
p
);
...
...
@@ -89,10 +89,10 @@ pkcs1_rsa_md5_encode_digest(mpz_t m, unsigned key_size, const uint8_t *digest)
TMP_DECL
(
em
,
uint8_t
,
NETTLE_MAX_BIGNUM_SIZE
);
TMP_ALLOC
(
em
,
key_size
);
p
=
pkcs1_signature_prefix
(
key_size
,
em
,
sizeof
(
md5_prefix
),
md5_prefix
,
MD5_DIGEST_SIZE
);
p
=
_
pkcs1_signature_prefix
(
key_size
,
em
,
sizeof
(
md5_prefix
),
md5_prefix
,
MD5_DIGEST_SIZE
);
if
(
p
)
{
memcpy
(
p
,
digest
,
MD5_DIGEST_SIZE
);
...
...
pkcs1-rsa-sha1.c
View file @
4a4201f9
...
...
@@ -68,10 +68,10 @@ pkcs1_rsa_sha1_encode(mpz_t m, unsigned key_size, struct sha1_ctx *hash)
TMP_DECL
(
em
,
uint8_t
,
NETTLE_MAX_BIGNUM_SIZE
);
TMP_ALLOC
(
em
,
key_size
);
p
=
pkcs1_signature_prefix
(
key_size
,
em
,
sizeof
(
sha1_prefix
),
sha1_prefix
,
SHA1_DIGEST_SIZE
);
p
=
_
pkcs1_signature_prefix
(
key_size
,
em
,
sizeof
(
sha1_prefix
),
sha1_prefix
,
SHA1_DIGEST_SIZE
);
if
(
p
)
{
sha1_digest
(
hash
,
SHA1_DIGEST_SIZE
,
p
);
...
...
@@ -89,10 +89,10 @@ pkcs1_rsa_sha1_encode_digest(mpz_t m, unsigned key_size, const uint8_t *digest)
TMP_DECL
(
em
,
uint8_t
,
NETTLE_MAX_BIGNUM_SIZE
);
TMP_ALLOC
(
em
,
key_size
);
p
=
pkcs1_signature_prefix
(
key_size
,
em
,
sizeof
(
sha1_prefix
),
sha1_prefix
,
SHA1_DIGEST_SIZE
);
p
=
_
pkcs1_signature_prefix
(
key_size
,
em
,
sizeof
(
sha1_prefix
),
sha1_prefix
,
SHA1_DIGEST_SIZE
);
if
(
p
)
{
memcpy
(
p
,
digest
,
SHA1_DIGEST_SIZE
);
...
...
pkcs1-rsa-sha256.c
View file @
4a4201f9
...
...
@@ -66,10 +66,10 @@ pkcs1_rsa_sha256_encode(mpz_t m, unsigned key_size, struct sha256_ctx *hash)
TMP_DECL
(
em
,
uint8_t
,
NETTLE_MAX_BIGNUM_SIZE
);
TMP_ALLOC
(
em
,
key_size
);
p
=
pkcs1_signature_prefix
(
key_size
,
em
,
sizeof
(
sha256_prefix
),
sha256_prefix
,
SHA256_DIGEST_SIZE
);
p
=
_
pkcs1_signature_prefix
(
key_size
,
em
,
sizeof
(
sha256_prefix
),
sha256_prefix
,
SHA256_DIGEST_SIZE
);
if
(
p
)
{
sha256_digest
(
hash
,
SHA256_DIGEST_SIZE
,
p
);
...
...
@@ -87,10 +87,10 @@ pkcs1_rsa_sha256_encode_digest(mpz_t m, unsigned key_size, const uint8_t *digest
TMP_DECL
(
em
,
uint8_t
,
NETTLE_MAX_BIGNUM_SIZE
);
TMP_ALLOC
(
em
,
key_size
);
p
=
pkcs1_signature_prefix
(
key_size
,
em
,
sizeof
(
sha256_prefix
),
sha256_prefix
,
SHA256_DIGEST_SIZE
);
p
=
_
pkcs1_signature_prefix
(
key_size
,
em
,
sizeof
(
sha256_prefix
),
sha256_prefix
,
SHA256_DIGEST_SIZE
);
if
(
p
)
{
memcpy
(
p
,
digest
,
SHA256_DIGEST_SIZE
);
...
...
pkcs1-rsa-sha512.c
View file @
4a4201f9
...
...
@@ -66,10 +66,10 @@ pkcs1_rsa_sha512_encode(mpz_t m, unsigned key_size, struct sha512_ctx *hash)
TMP_DECL
(
em
,
uint8_t
,
NETTLE_MAX_BIGNUM_SIZE
);
TMP_ALLOC
(
em
,
key_size
);
p
=
pkcs1_signature_prefix
(
key_size
,
em
,
sizeof
(
sha512_prefix
),
sha512_prefix
,
SHA512_DIGEST_SIZE
);
p
=
_
pkcs1_signature_prefix
(
key_size
,
em
,
sizeof
(
sha512_prefix
),
sha512_prefix
,
SHA512_DIGEST_SIZE
);
if
(
p
)
{
sha512_digest
(
hash
,
SHA512_DIGEST_SIZE
,
p
);
...
...
@@ -87,10 +87,10 @@ pkcs1_rsa_sha512_encode_digest(mpz_t m, unsigned key_size, const uint8_t *digest
TMP_DECL
(
em
,
uint8_t
,
NETTLE_MAX_BIGNUM_SIZE
);
TMP_ALLOC
(
em
,
key_size
);
p
=
pkcs1_signature_prefix
(
key_size
,
em
,
sizeof
(
sha512_prefix
),
sha512_prefix
,
SHA512_DIGEST_SIZE
);
p
=
_
pkcs1_signature_prefix
(
key_size
,
em
,
sizeof
(
sha512_prefix
),
sha512_prefix
,
SHA512_DIGEST_SIZE
);
if
(
p
)
{
memcpy
(
p
,
digest
,
SHA512_DIGEST_SIZE
);
...
...
pkcs1.c
View file @
4a4201f9
...
...
@@ -40,11 +40,11 @@
* total size equals the octet size of n.
*/
uint8_t
*
pkcs1_signature_prefix
(
unsigned
key_size
,
uint8_t
*
buffer
,
unsigned
id_size
,
const
uint8_t
*
id
,
unsigned
digest_size
)
_
pkcs1_signature_prefix
(
unsigned
key_size
,
uint8_t
*
buffer
,
unsigned
id_size
,
const
uint8_t
*
id
,
unsigned
digest_size
)
{
unsigned
j
;
...
...
pkcs1.h
View file @
4a4201f9
...
...
@@ -34,7 +34,7 @@ extern "C" {
#endif
/* Name mangling */
#define pkcs1_signature_prefix nettle_pkcs1_signature_prefix
#define
_
pkcs1_signature_prefix
_
nettle_pkcs1_signature_prefix
#define pkcs1_rsa_digest_encode nettle_pkcs1_rsa_digest_encode
#define pkcs1_rsa_md5_encode nettle_pkcs1_rsa_md5_encode
#define pkcs1_rsa_md5_encode_digest nettle_pkcs1_rsa_md5_encode_digest
...
...
@@ -53,11 +53,11 @@ struct sha256_ctx;
struct
sha512_ctx
;
uint8_t
*
pkcs1_signature_prefix
(
unsigned
key_size
,
uint8_t
*
buffer
,
unsigned
id_size
,
const
uint8_t
*
id
,
unsigned
digest_size
);
_
pkcs1_signature_prefix
(
unsigned
key_size
,
uint8_t
*
buffer
,
unsigned
id_size
,
const
uint8_t
*
id
,
unsigned
digest_size
);
int
pkcs1_encrypt
(
unsigned
key_size
,
...
...
testsuite/pkcs1-test.c
View file @
4a4201f9
...
...
@@ -9,8 +9,8 @@ test_main(void)
uint8_t
expected
[
16
]
=
{
0
,
1
,
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0
,
'a'
,
'b'
,
'c'
};
pkcs1_signature_prefix
(
sizeof
(
buffer
),
buffer
,
3
,
"abc"
,
0
);
_
pkcs1_signature_prefix
(
sizeof
(
buffer
),
buffer
,
3
,
"abc"
,
0
);
ASSERT
(
MEMEQ
(
sizeof
(
buffer
),
buffer
,
expected
));
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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