projects
/
silc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
04f41c4
)
updates.
author
Pekka Riikonen
<priikone@silcnet.org>
Tue, 20 Feb 2001 15:50:01 +0000
(15:50 +0000)
committer
Pekka Riikonen
<priikone@silcnet.org>
Tue, 20 Feb 2001 15:50:01 +0000
(15:50 +0000)
lib/silccrypt/pkcs1.c
patch
|
blob
|
history
diff --git
a/lib/silccrypt/pkcs1.c
b/lib/silccrypt/pkcs1.c
index 2ba6f3efbaf5a62ca753f28a4dc7a661a45d213b..8420b8b100416359a287d395e68fa0ca703574fc 100644
(file)
--- a/
lib/silccrypt/pkcs1.c
+++ b/
lib/silccrypt/pkcs1.c
@@
-110,7
+110,6
@@
RSA_FormatOneBlock(unsigned int modulusLen, RSA_BlockType blockType,
unsigned char *block;
unsigned char *bp;
int padLen;
unsigned char *block;
unsigned char *bp;
int padLen;
- int i;
block = (unsigned char *) silc_malloc(modulusLen);
if (block == NULL)
block = (unsigned char *) silc_malloc(modulusLen);
if (block == NULL)
@@
-153,6
+152,15
@@
RSA_FormatOneBlock(unsigned int modulusLen, RSA_BlockType blockType,
* Blocks intended for public-key operation.
*/
case RSA_BlockPublic:
* Blocks intended for public-key operation.
*/
case RSA_BlockPublic:
+
+ /* XXX For now we can't do this because we can't get the
+ SilcRNG object down to this level. */
+ silc_free(block);
+ return NULL;
+
+#if 0
+ int i;
+
/*
* 0x00 || BT || Pad || 0x00 || ActualData
* 1 1 padLen 1 data_len
/*
* 0x00 || BT || Pad || 0x00 || ActualData
* 1 1 padLen 1 data_len
@@
-163,12
+171,14
@@
RSA_FormatOneBlock(unsigned int 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
);
+
RNG_GenerateGlobalRandomBytes(bp + i, 1
);
} while (bp[i] == RSA_BLOCK_AFTER_PAD_OCTET);
}
bp += padLen;
*bp++ = RSA_BLOCK_AFTER_PAD_OCTET;
memcpy(bp, data, data_len);
} while (bp[i] == RSA_BLOCK_AFTER_PAD_OCTET);
}
bp += padLen;
*bp++ = RSA_BLOCK_AFTER_PAD_OCTET;
memcpy(bp, data, data_len);
+#endif
+
break;
default:
break;
default: