projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Run entire source base through GNU indent to tidy up the varying
[u/mdw/putty]
/
sshrsag.c
diff --git
a/sshrsag.c
b/sshrsag.c
index
7b1883a
..
9e543c9
100644
(file)
--- a/
sshrsag.c
+++ b/
sshrsag.c
@@
-4,25
+4,33
@@
#include "ssh.h"
#include "ssh.h"
-#define RSA_EXPONENT 37 /* we like this prime */
+#define RSA_EXPONENT 37
/* we like this prime */
-static void diagbn(char *prefix, Bignum md) {
+#if 0 /* bignum diagnostic function */
+static void diagbn(char *prefix, Bignum md)
+{
int i, nibbles, morenibbles;
static const char hex[] = "0123456789ABCDEF";
printf("%s0x", prefix ? prefix : "");
int i, nibbles, morenibbles;
static const char hex[] = "0123456789ABCDEF";
printf("%s0x", prefix ? prefix : "");
- nibbles = (3 + ssh1_bignum_bitcount(md))/4; if (nibbles<1) nibbles=1;
- morenibbles = 4*md[0] - nibbles;
- for (i=0; i<morenibbles; i++) putchar('-');
- for (i=nibbles; i-- ;)
- putchar(hex[(bignum_byte(md, i/2) >> (4*(i%2))) & 0xF]);
+ nibbles = (3 + bignum_bitcount(md)) / 4;
+ if (nibbles < 1)
+ nibbles = 1;
+ morenibbles = 4 * md[0] - nibbles;
+ for (i = 0; i < morenibbles; i++)
+ putchar('-');
+ for (i = nibbles; i--;)
+ putchar(hex[(bignum_byte(md, i / 2) >> (4 * (i % 2))) & 0xF]);
- if (prefix) putchar('\n');
+ if (prefix)
+ putchar('\n');
}
}
+#endif
-int rsa_generate(struct RSAKey *key, struct RSAAux *aux, int bits,
- progfn_t pfn, void *pfnparam) {
+int rsa_generate(struct RSAKey *key, int bits, progfn_t pfn,
+ void *pfnparam)
+{
Bignum pm1, qm1, phi_n;
/*
Bignum pm1, qm1, phi_n;
/*
@@
-53,15
+61,14
@@
int rsa_generate(struct RSAKey *key, struct RSAAux *aux, int bits,
* time. We do this in 16-bit fixed point, so 29.34 becomes
* 0x1D.57C4.
*/
* time. We do this in 16-bit fixed point, so 29.34 becomes
* 0x1D.57C4.
*/
- pfn(pfnparam, -1, -0x1D57C4
/(bits/
2));
- pfn(pfnparam, -2, -0x1D57C4
/(bits-bits/
2));
+ pfn(pfnparam, -1, -0x1D57C4
/ (bits /
2));
+ pfn(pfnparam, -2, -0x1D57C4
/ (bits - bits /
2));
pfn(pfnparam, -3, 5);
/*
* We don't generate e; we just use a standard one always.
*/
key->exponent = bignum_from_short(RSA_EXPONENT);
pfn(pfnparam, -3, 5);
/*
* We don't generate e; we just use a standard one always.
*/
key->exponent = bignum_from_short(RSA_EXPONENT);
- diagbn("e = ",key->exponent);
/*
* Generate p and q: primes with combined length `bits', not
/*
* Generate p and q: primes with combined length `bits', not
@@
-70,16
+77,16
@@
int rsa_generate(struct RSAKey *key, struct RSAAux *aux, int bits,
* general that's slightly more fiddly to arrange. By choosing
* a prime e, we can simplify the criterion.)
*/
* general that's slightly more fiddly to arrange. By choosing
* a prime e, we can simplify the criterion.)
*/
-
aux->p = primegen(bits/
2, RSA_EXPONENT, 1, 1, pfn, pfnparam);
-
aux->q = primegen(bits - bits/
2, RSA_EXPONENT, 1, 2, pfn, pfnparam);
+
key->p = primegen(bits /
2, RSA_EXPONENT, 1, 1, pfn, pfnparam);
+
key->q = primegen(bits - bits /
2, RSA_EXPONENT, 1, 2, pfn, pfnparam);
/*
* Ensure p > q, by swapping them if not.
*/
/*
* Ensure p > q, by swapping them if not.
*/
- if (bignum_cmp(
aux->p, aux
->q) < 0) {
-
Bignum t = aux
->p;
-
aux->p = aux
->q;
-
aux
->q = t;
+ if (bignum_cmp(
key->p, key
->q) < 0) {
+
Bignum t = key
->p;
+
key->p = key
->q;
+
key
->q = t;
}
/*
}
/*
@@
-88,27
+95,20
@@
int rsa_generate(struct RSAKey *key, struct RSAAux *aux, int bits,
* and (q^-1 mod p).
*/
pfn(pfnparam, 3, 1);
* and (q^-1 mod p).
*/
pfn(pfnparam, 3, 1);
- key->modulus = bigmul(
aux->p, aux
->q);
+ key->modulus = bigmul(
key->p, key
->q);
pfn(pfnparam, 3, 2);
pfn(pfnparam, 3, 2);
- pm1 = copybn(
aux
->p);
+ pm1 = copybn(
key
->p);
decbn(pm1);
decbn(pm1);
- qm1 = copybn(
aux
->q);
+ qm1 = copybn(
key
->q);
decbn(qm1);
phi_n = bigmul(pm1, qm1);
pfn(pfnparam, 3, 3);
freebn(pm1);
freebn(qm1);
decbn(qm1);
phi_n = bigmul(pm1, qm1);
pfn(pfnparam, 3, 3);
freebn(pm1);
freebn(qm1);
- diagbn("p = ", aux->p);
- diagbn("q = ", aux->q);
- diagbn("e = ", key->exponent);
- diagbn("n = ", key->modulus);
- diagbn("phi(n) = ", phi_n);
key->private_exponent = modinv(key->exponent, phi_n);
pfn(pfnparam, 3, 4);
key->private_exponent = modinv(key->exponent, phi_n);
pfn(pfnparam, 3, 4);
- diagbn("d = ", key->private_exponent);
- aux->iqmp = modinv(aux->q, aux->p);
+ key->iqmp = modinv(key->q, key->p);
pfn(pfnparam, 3, 5);
pfn(pfnparam, 3, 5);
- diagbn("iqmp = ", aux->iqmp);
/*
* Clean up temporary numbers.
/*
* Clean up temporary numbers.