struct rsapriv *st=sst;
rsa_sethash(&st->common, hash, &st->ops.hash);
}
+static void rsacommon_dispose(struct rsacommon *c)
+{
+ free(c->hashbuf);
+}
static void emsa_pkcs1(MP_INT *n, MP_INT *m,
const uint8_t *data, int32_t datalen)
return ok;
}
+static void rsapub_dispose(void *sst) {
+ struct rsapub *st=sst;
+
+ mpz_clear(&st->e);
+ mpz_clear(&st->n);
+ rsacommon_dispose(&st->common);
+ free(st);
+}
+
static list_t *rsapub_apply(closure_t *self, struct cloc loc, dict_t *context,
list_t *args)
{
st->ops.unpick=rsa_sig_unpick;
st->ops.check=rsa_sig_check;
st->ops.hash=0;
- st->ops.dispose=0; /* xxx */
+ st->ops.dispose=rsapub_dispose;
st->loc=loc;
i=list_elem(args,0);
return new_closure(&st->cl);
}
+struct rsapriv_load_ctx {
+ void (*verror)(struct rsapriv_load_ctx *l,
+ FILE *maybe_f, bool_t unsup,
+ const char *message, va_list args);
+ union {
+ struct {
+ struct cloc loc;
+ } apply;
+ } u;
+};
+
+#define LDFATAL(...) ({ load_error(l,0,0,__VA_ARGS__); goto error_out; })
+#define LDUNSUP(...) ({ load_error(l,0,1,__VA_ARGS__); goto error_out; })
+#define LDFATAL_FILE(...) ({ load_error(l,f,0,__VA_ARGS__); goto error_out; })
+#define LDUNSUP_FILE(...) ({ load_error(l,f,1,__VA_ARGS__); goto error_out; })
+#define FREE(b) ({ free((b)); (b)=0; })
+
static uint32_t keyfile_get_int(struct cloc loc, FILE *f)
{
uint32_t r;
return r;
}
-#define LDFATAL(...) cfgfatal(loc,__VA_ARGS__)
-#define LDUNSUP(...) cfgfatal(loc,__VA_ARGS__)
-#define LDFATAL_FILE(...) cfgfatal_maybefile(f,loc,__VA_ARGS__)
-#define LDUNSUP_FILE(...) cfgfatal_maybefile(f,loc,__VA_ARGS__)
-#define FREE(b) free(b)
+static void load_error(struct rsapriv_load_ctx *l, FILE *maybe_f,
+ bool_t unsup, const char *fmt, ...)
+{
+ va_list al;
+ va_start(al,fmt);
+ l->verror(l,maybe_f,unsup,fmt,al);
+ va_end(al);
+}
-static struct rsapriv *rsa_loadpriv_core(FILE *f, struct cloc loc,
+static void rsapriv_dispose(void *sst)
+{
+ struct rsapriv *st=sst;
+ mpz_clear(&st->n);
+ mpz_clear(&st->p); mpz_clear(&st->dp);
+ mpz_clear(&st->q); mpz_clear(&st->dq);
+ mpz_clear(&st->w);
+ rsacommon_dispose(&st->common);
+ free(st);
+}
+
+static struct rsapriv *rsa_loadpriv_core(struct rsapriv_load_ctx *l,
+ FILE *f, struct cloc loc,
bool_t do_validity_check,
const char *filename)
{
st->common.hashbuf=NULL;
st->ops.sign=rsa_sign;
st->ops.hash=0;
- st->ops.dispose=0; /* xxx */
+ st->ops.dispose=rsapriv_dispose;
st->loc=loc;
mpz_init(&st->n);
mpz_init(&st->q);
length=strlen(AUTHFILE_ID_STRING)+1;
b=safe_malloc(length,"rsapriv_apply");
if (fread(b,length,1,f)!=1 || memcmp(b,AUTHFILE_ID_STRING,length)!=0) {
- LDUNSUP_FILE("rsa-private","failed to read magic ID"
+ LDUNSUP_FILE("failed to read magic ID"
" string from SSH1 private keyfile \"%s\"\n",
filename);
}
cipher_type=fgetc(f);
keyfile_get_int(loc,f); /* "Reserved data" */
if (cipher_type != 0) {
- LDUNSUP("rsa-private","we don't support encrypted keyfiles\n");
+ LDUNSUP("we don't support encrypted keyfiles\n");
}
/* Read the public key */
keyfile_get_int(loc,f); /* Not sure what this is */
length=(keyfile_get_short(loc,f)+7)/8;
if (length>RSA_MAX_MODBYTES) {
- LDFATAL("rsa-private","implausible length %ld for modulus\n",
+ LDFATAL("implausible length %ld for modulus\n",
length);
}
b=safe_malloc(length,"rsapriv_apply");
if (fread(b,length,1,f) != 1) {
- LDFATAL_FILE("rsa-private","error reading modulus\n");
+ LDFATAL_FILE("error reading modulus\n");
}
read_mpbin(&st->n,b,length);
FREE(b);
length=(keyfile_get_short(loc,f)+7)/8;
if (length>RSA_MAX_MODBYTES) {
- LDFATAL("rsa-private","implausible length %ld for e\n",length);
+ LDFATAL("implausible length %ld for e\n",length);
}
b=safe_malloc(length,"rsapriv_apply");
if (fread(b,length,1,f)!=1) {
- LDFATAL_FILE("rsa-private","error reading e\n");
+ LDFATAL_FILE("error reading e\n");
}
read_mpbin(&e,b,length);
FREE(b);
length=keyfile_get_int(loc,f);
if (length>1024) {
- LDFATAL("rsa-private","implausibly long (%ld) key comment\n",
+ LDFATAL("implausibly long (%ld) key comment\n",
length);
}
c=safe_malloc(length+1,"rsapriv_apply");
if (fread(c,length,1,f)!=1) {
- LDFATAL_FILE("rsa-private","error reading key comment\n");
+ LDFATAL_FILE("error reading key comment\n");
}
c[length]=0;
keyfile is not encrypted, so they should be */
if (keyfile_get_short(loc,f) != keyfile_get_short(loc,f)) {
- LDFATAL("rsa-private","corrupt keyfile\n");
+ LDFATAL("corrupt keyfile\n");
}
/* Read d */
length=(keyfile_get_short(loc,f)+7)/8;
if (length>RSA_MAX_MODBYTES) {
- LDFATAL("rsa-private","implausibly long (%ld) decryption key\n",
+ LDFATAL("implausibly long (%ld) decryption key\n",
length);
}
b=safe_malloc(length,"rsapriv_apply");
if (fread(b,length,1,f)!=1) {
- LDFATAL_FILE("rsa-private",
- "error reading decryption key\n");
+ LDFATAL_FILE("error reading decryption key\n");
}
read_mpbin(&d,b,length);
FREE(b);
/* Read iqmp (inverse of q mod p) */
length=(keyfile_get_short(loc,f)+7)/8;
if (length>RSA_MAX_MODBYTES) {
- LDFATAL("rsa-private","implausibly long (%ld)"
+ LDFATAL("implausibly long (%ld)"
" iqmp auxiliary value\n", length);
}
b=safe_malloc(length,"rsapriv_apply");
if (fread(b,length,1,f)!=1) {
- LDFATAL_FILE("rsa-private",
- "error reading decryption key\n");
+ LDFATAL_FILE("error reading decryption key\n");
}
read_mpbin(&iqmp,b,length);
FREE(b);
/* Read q (the smaller of the two primes) */
length=(keyfile_get_short(loc,f)+7)/8;
if (length>RSA_MAX_MODBYTES) {
- LDFATAL("rsa-private","implausibly long (%ld) q value\n",
+ LDFATAL("implausibly long (%ld) q value\n",
length);
}
b=safe_malloc(length,"rsapriv_apply");
if (fread(b,length,1,f)!=1) {
- LDFATAL_FILE("rsa-private",
- "error reading q value\n");
+ LDFATAL_FILE("error reading q value\n");
}
read_mpbin(&st->q,b,length);
FREE(b);
/* Read p (the larger of the two primes) */
length=(keyfile_get_short(loc,f)+7)/8;
if (length>RSA_MAX_MODBYTES) {
- LDFATAL("rsa-private","implausibly long (%ld) p value\n",
+ LDFATAL("implausibly long (%ld) p value\n",
length);
}
b=safe_malloc(length,"rsapriv_apply");
if (fread(b,length,1,f)!=1) {
- LDFATAL_FILE("rsa-private",
- "error reading p value\n");
+ LDFATAL_FILE("error reading p value\n");
}
read_mpbin(&st->p,b,length);
FREE(b);
done_checks:
if (!valid) {
- LDFATAL("rsa-private","file \"%s\" does not contain a "
+ LDFATAL("file \"%s\" does not contain a "
"valid RSA key!\n",filename);
}
+
+assume_valid:
+out:
mpz_clear(&tmp);
mpz_clear(&tmp2);
mpz_clear(&tmp3);
+ FREE(b);
FREE(c);
mpz_clear(&e);
mpz_clear(&d);
mpz_clear(&iqmp);
-assume_valid:
return st;
+
+error_out:
+ if (st) rsapriv_dispose(st);
+ st=0;
+ goto out;
+}
+
+static void verror_cfgfatal(struct rsapriv_load_ctx *l,
+ FILE *maybe_f, bool_t unsup,
+ const char *message, va_list args)
+{
+ vcfgfatal_maybefile(maybe_f,l->u.apply.loc,"rsa-private",message,args);
}
static list_t *rsapriv_apply(closure_t *self, struct cloc loc, dict_t *context,
item_t *i;
cstring_t filename;
FILE *f;
+ struct rsapriv_load_ctx l[1];
+
+ l->verror=verror_cfgfatal;
+ l->u.apply.loc=loc;
/* Argument is filename pointing to SSH1 private key file */
i=list_elem(args,0);
do_validity_check=False;
}
- st=rsa_loadpriv_core(f,loc,do_validity_check,filename);
+ st=rsa_loadpriv_core(l,f,loc,do_validity_check,filename);
fclose(f);
return new_closure(&st->cl);
}
~ianmdlvl / secnet.git / blobdiff