#include <gmp.h>
#include "secnet.h"
#include "util.h"
+#include "unaligned.h"
#define AUTHFILE_ID_STRING "SSH PRIVATE KEY FILE FORMAT 1.1\n"
#define mpp(s,n) do { char *p = mpz_get_str(NULL,16,n); printf("%s 0x%sL\n", s, p); free(p); } while (0)
+struct rsacommon {
+ struct hash_if *hashi;
+ uint8_t *hashbuf;
+};
+
struct rsapriv {
closure_t cl;
struct sigprivkey_if ops;
struct cloc loc;
+ struct rsacommon common;
MP_INT n;
MP_INT p, dp;
MP_INT q, dq;
closure_t cl;
struct sigpubkey_if ops;
struct cloc loc;
+ struct rsacommon common;
MP_INT e;
MP_INT n;
};
static const char *hexchars="0123456789abcdef";
+static void rsa_sethash(struct rsacommon *c, struct hash_if *hash)
+{
+ free(c->hashbuf);
+ c->hashbuf=safe_malloc(hash->hlen, "generate_msg");
+ c->hashi=hash;
+}
+static void rsa_pub_sethash(void *sst, struct hash_if *hash)
+{
+ struct rsapub *st=sst;
+ rsa_sethash(&st->common, hash);
+}
+static void rsa_priv_sethash(void *sst, struct hash_if *hash)
+{
+ struct rsapriv *st=sst;
+ rsa_sethash(&st->common, hash);
+}
+static void rsa_hash(struct rsacommon *c, const uint8_t *buf, int32_t len)
+{
+ hash_hash(c->hashi,buf,len,c->hashbuf);
+}
+
static void emsa_pkcs1(MP_INT *n, MP_INT *m,
const uint8_t *data, int32_t datalen)
{
mpz_set_str(m, buff, 16);
}
-static string_t rsa_sign(void *sst, uint8_t *data, int32_t datalen)
+static bool_t rsa_sign(void *sst, uint8_t *data, int32_t datalen,
+ struct buffer_if *msg)
{
struct rsapriv *st=sst;
MP_INT a, b, u, v, tmp, tmp2;
- string_t signature;
+ string_t signature = 0;
+ bool_t ok;
mpz_init(&a);
mpz_init(&b);
+ rsa_hash(&st->common,data,datalen);
/* Construct the message representative. */
- emsa_pkcs1(&st->n, &a, data, datalen);
+ emsa_pkcs1(&st->n, &a, st->common.hashbuf, st->common.hashi->hlen);
/*
* Produce an RSA signature (a^d mod n) using the Chinese
signature=write_mpstring(&b);
+ uint8_t *op = buf_append(msg,2);
+ if (!op) { ok=False; goto out; }
+ size_t l = strlen(signature);
+ assert(l < 65536);
+ put_uint16(op, l);
+ op = buf_append(msg,l);
+ if (!op) { ok=False; goto out; }
+ memcpy(op, signature, l);
+
+ ok = True;
+
+ out:
+ free(signature);
mpz_clear(&b);
mpz_clear(&a);
- return signature;
+ return ok;
+}
+
+static bool_t rsa_sig_unpick(void *sst, struct buffer_if *msg,
+ struct alg_msg_data *sig)
+{
+ uint8_t *lp = buf_unprepend(msg, 2);
+ if (!lp) return False;
+ sig->len = get_uint16(lp);
+ sig->start = buf_unprepend(msg, sig->len);
+ if (!sig->start) return False;
+
+ /* In `rsa_sig_check' below, we assume that we can write a nul
+ * terminator following the signature. Make sure there's enough space.
+ */
+ if (msg->start >= msg->base + msg->alloclen)
+ return False;
+
+ return True;
}
static sig_checksig_fn rsa_sig_check;
static bool_t rsa_sig_check(void *sst, uint8_t *data, int32_t datalen,
- cstring_t signature)
+ const struct alg_msg_data *sig)
{
struct rsapub *st=sst;
MP_INT a, b, c;
mpz_init(&b);
mpz_init(&c);
- emsa_pkcs1(&st->n, &a, data, datalen);
+ rsa_hash(&st->common,data,datalen);
+ emsa_pkcs1(&st->n, &a, st->common.hashbuf, st->common.hashi->hlen);
- mpz_set_str(&b, signature, 16);
+ /* Terminate signature with a '0' - already checked that this will fit */
+ int save = sig->start[sig->len];
+ sig->start[sig->len] = 0;
+ mpz_set_str(&b, sig->start, 16);
+ sig->start[sig->len] = save;
mpz_powm(&c, &b, &st->e, &st->n);
st->cl.apply=NULL;
st->cl.interface=&st->ops;
st->ops.st=st;
+ st->ops.sethash=rsa_pub_sethash;
+ st->common.hashbuf=NULL;
+ st->ops.unpick=rsa_sig_unpick;
st->ops.check=rsa_sig_check;
st->loc=loc;
st->cl.apply=NULL;
st->cl.interface=&st->ops;
st->ops.st=st;
+ st->ops.sethash=rsa_priv_sethash;
+ st->common.hashbuf=NULL;
st->ops.sign=rsa_sign;
st->loc=loc;