projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Integer type name change.
[silc.git]
/
lib
/
silccrypt
/
pkcs1.c
diff --git
a/lib/silccrypt/pkcs1.c
b/lib/silccrypt/pkcs1.c
index 970324a556dc604155f2ca2879ba76362c494ff3..6e5a6a4a560b181774b0ab82364fb5e5503458dd 100644
(file)
--- a/
lib/silccrypt/pkcs1.c
+++ b/
lib/silccrypt/pkcs1.c
@@
-105,8
+105,8
@@
typedef enum {
* the rules defined in PKCS #1.
*/
static unsigned char *
* the rules defined in PKCS #1.
*/
static unsigned char *
-RSA_FormatOneBlock(
ui
nt32 modulusLen, RSA_BlockType blockType,
- unsigned char *data,
ui
nt32 data_len)
+RSA_FormatOneBlock(
SilcUI
nt32 modulusLen, RSA_BlockType blockType,
+ unsigned char *data,
SilcUI
nt32 data_len)
{
unsigned char *block;
unsigned char *bp;
{
unsigned char *block;
unsigned char *bp;
@@
-164,7
+164,7
@@
RSA_FormatOneBlock(uint32 modulusLen, RSA_BlockType blockType,
for (i = 0; i < padLen; i++) {
/* Pad with non-zero random data. */
do {
for (i = 0; i < padLen; i++) {
/* Pad with non-zero random data. */
do {
-
silc_rng_global_get_byte(bp + i
);
+
bp[i] = silc_rng_global_get_byte(
);
} while (bp[i] == RSA_BLOCK_AFTER_PAD_OCTET);
}
bp += padLen;
} while (bp[i] == RSA_BLOCK_AFTER_PAD_OCTET);
}
bp += padLen;
@@
-181,10
+181,10
@@
RSA_FormatOneBlock(uint32 modulusLen, RSA_BlockType blockType,
}
static int
}
static int
-RSA_FormatBlock(unsigned char **result,
ui
nt32 *result_len,
-
ui
nt32 modulusLen,
+RSA_FormatBlock(unsigned char **result,
SilcUI
nt32 *result_len,
+
SilcUI
nt32 modulusLen,
RSA_BlockType blockType, unsigned char *data,
RSA_BlockType blockType, unsigned char *data,
-
ui
nt32 data_len)
+
SilcUI
nt32 data_len)
{
/*
* XXX For now assume that the data length fits in a single
{
/*
* XXX For now assume that the data length fits in a single
@@
-238,14
+238,14
@@
RSA_FormatBlock(unsigned char **result, uint32 *result_len,
*/
unsigned char *
RSA_DecodeOneBlock(unsigned char *data,
*/
unsigned char *
RSA_DecodeOneBlock(unsigned char *data,
-
ui
nt32 modulusLen,
-
ui
nt32 expectedLen,
+
SilcUI
nt32 modulusLen,
+
SilcUI
nt32 expectedLen,
RSA_BlockType bt,
RSA_BlockType bt,
-
ui
nt32 *pResultLen)
+
SilcUI
nt32 *pResultLen)
{
RSA_BlockType blockType;
unsigned char *dp, *res;
{
RSA_BlockType blockType;
unsigned char *dp, *res;
-
ui
nt32 i, len = 0;
+
SilcUI
nt32 i, len = 0;
dp = data;
if (dp[0] != RSA_BLOCK_FIRST_OCTET) {
dp = data;
if (dp[0] != RSA_BLOCK_FIRST_OCTET) {
@@
-317,7
+317,7
@@
SILC_PKCS_API_ENCRYPT(pkcs1)
SilcMPInt mp_tmp;
SilcMPInt mp_dst;
unsigned char *padded;
SilcMPInt mp_tmp;
SilcMPInt mp_dst;
unsigned char *padded;
-
ui
nt32 padded_len, len = key->bits / 8;
+
SilcUI
nt32 padded_len, len = key->bits / 8;
/* Pad data */
if (!RSA_FormatBlock(&padded, &padded_len, len,
/* Pad data */
if (!RSA_FormatBlock(&padded, &padded_len, len,
@@
-353,7
+353,7
@@
SILC_PKCS_API_DECRYPT(pkcs1)
SilcMPInt mp_tmp;
SilcMPInt mp_dst;
unsigned char *padded, *unpadded;
SilcMPInt mp_tmp;
SilcMPInt mp_dst;
unsigned char *padded, *unpadded;
-
ui
nt32 padded_len;
+
SilcUI
nt32 padded_len;
silc_mp_init(&mp_tmp);
silc_mp_init(&mp_dst);
silc_mp_init(&mp_tmp);
silc_mp_init(&mp_dst);
@@
-400,8
+400,8
@@
SILC_PKCS_API_SIGN(pkcs1)
SilcMPInt mp_tmp;
SilcMPInt mp_dst;
unsigned char *padded;
SilcMPInt mp_tmp;
SilcMPInt mp_dst;
unsigned char *padded;
-
ui
nt32 padded_len;
-
ui
nt32 len = key->bits / 8;
+
SilcUI
nt32 padded_len;
+
SilcUI
nt32 len = key->bits / 8;
/* Pad data */
if (!RSA_FormatBlock(&padded, &padded_len, len, RSA_BlockPrivate,
/* Pad data */
if (!RSA_FormatBlock(&padded, &padded_len, len, RSA_BlockPrivate,
@@
-438,7
+438,7
@@
SILC_PKCS_API_VERIFY(pkcs1)
SilcMPInt mp_tmp2;
SilcMPInt mp_dst;
unsigned char *verify, *unpadded;
SilcMPInt mp_tmp2;
SilcMPInt mp_dst;
unsigned char *verify, *unpadded;
-
ui
nt32 verify_len, len = key->bits / 8;
+
SilcUI
nt32 verify_len, len = key->bits / 8;
silc_mp_init(&mp_tmp2);
silc_mp_init(&mp_dst);
silc_mp_init(&mp_tmp2);
silc_mp_init(&mp_dst);