uint8_t *hashbuf;
};
+struct load_ctx {
+ void (*verror)(struct load_ctx *l,
+ FILE *maybe_f, bool_t unsup,
+ const char *message, va_list args);
+ bool_t (*postreadcheck)(struct load_ctx *l, FILE *f);
+ struct cloc *loc;
+ union {
+ struct {
+ struct log_if *log;
+ } tryload;
+ } u;
+};
+
+FORMAT(printf,4,0)
+static void verror_tryload(struct load_ctx *l,
+ FILE *maybe_f, bool_t unsup,
+ const char *message, va_list args)
+{
+ int class=unsup ? M_DEBUG : M_ERR;
+ slilog_part(l->u.tryload.log,class,"rsa1priv load: ");
+ vslilog(l->u.tryload.log,class,message,args);
+}
+
+static void verror_cfgfatal(struct load_ctx *l,
+ FILE *maybe_f, bool_t unsup,
+ const char *message, va_list args)
+{
+ vcfgfatal_maybefile(maybe_f,*l->loc,"rsa-private",message,args);
+}
+
struct rsapriv {
closure_t cl;
struct sigprivkey_if ops;
return new_closure(&st->cl);
}
-static uint32_t keyfile_get_int(struct cloc loc, FILE *f)
+static void load_error(struct 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);
+}
+
+#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; })
+#define KEYFILE_GET(is) ({ \
+ uint##is##_t keyfile_get_tmp=keyfile_get_##is(l,f); \
+ if (!l->postreadcheck(l,f)) goto error_out; \
+ keyfile_get_tmp; \
+ })
+
+static uint32_t keyfile_get_32(struct load_ctx *l, FILE *f)
{
uint32_t r;
r=fgetc(f)<<24;
r|=fgetc(f)<<16;
r|=fgetc(f)<<8;
r|=fgetc(f);
- cfgfile_postreadcheck(loc,f);
return r;
}
-static uint16_t keyfile_get_short(struct cloc loc, FILE *f)
+static uint16_t keyfile_get_16(struct load_ctx *l, FILE *f)
{
uint16_t r;
r=fgetc(f)<<8;
r|=fgetc(f);
- cfgfile_postreadcheck(loc,f);
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 rsapriv_dispose(void *sst)
{
struct rsapriv *st=sst;
free(st);
}
-static struct rsapriv *rsa_loadpriv_core(FILE *f, struct cloc loc,
- bool_t do_validity_check,
- const char *filename)
+static struct rsapriv *rsa_loadpriv_core(struct load_ctx *l,
+ FILE *f, struct cloc loc,
+ bool_t do_validity_check)
{
struct rsapriv *st=0;
long length;
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"
- " string from SSH1 private keyfile \"%s\"\n",
- filename);
+ LDUNSUP_FILE("failed to read magic ID"
+ " string from SSH1 private keyfile\n");
}
FREE(b);
cipher_type=fgetc(f);
- keyfile_get_int(loc,f); /* "Reserved data" */
+ KEYFILE_GET(32); /* "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;
+ KEYFILE_GET(32); /* Not sure what this is */
+ length=(KEYFILE_GET(16)+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;
+ length=(KEYFILE_GET(16)+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);
+ length=KEYFILE_GET(32);
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;
/* Check that the next two pairs of characters are identical - the
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");
+ if (KEYFILE_GET(16) != KEYFILE_GET(16)) {
+ LDFATAL("corrupt keyfile\n");
}
/* Read d */
- length=(keyfile_get_short(loc,f)+7)/8;
+ length=(KEYFILE_GET(16)+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;
+ length=(KEYFILE_GET(16)+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;
+ length=(KEYFILE_GET(16)+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;
+ length=(KEYFILE_GET(16)+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 "
- "valid RSA key!\n",filename);
+ LDFATAL("file does not contain a "
+ "valid RSA key!\n");
}
+
+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 bool_t postreadcheck_tryload(struct load_ctx *l, FILE *f)
+{
+ assert(!ferror(f));
+ if (feof(f)) { load_error(l,0,0,"eof mid-integer"); return False; }
+ return True;
+}
+
+bool_t rsa1_loadpriv(const struct sigscheme_info *algo,
+ struct buffer_if *privkeydata,
+ struct sigprivkey_if **sigpriv_r,
+ struct log_if *log)
+{
+ FILE *f=0;
+ struct rsapriv *st=0;
+
+ f=fmemopen(privkeydata->start,privkeydata->size,"r");
+ if (!f) {
+ slilog(log,M_ERR,"failed to fmemopen private key file\n");
+ goto error_out;
+ }
+
+ struct cloc loc;
+ loc.file="dynamically loaded";
+ loc.line=0;
+
+ struct load_ctx l[1];
+ l->verror=verror_tryload;
+ l->postreadcheck=postreadcheck_tryload;
+ l->loc=&loc;
+ l->u.tryload.log=log;
+
+ st=rsa_loadpriv_core(l,f,loc,False);
+ if (!st) goto error_out;
+ goto out;
+
+ error_out:
+ if (st) { free(st); st=0; }
+ out:
+ if (f) fclose(f);
+ if (!st) return False;
+ *sigpriv_r=&st->ops;
+ return True;
+}
+
+static bool_t postreadcheck_apply(struct load_ctx *l, FILE *f)
+{
+ cfgfile_postreadcheck(*l->loc,f);
+ return True;
}
static list_t *rsapriv_apply(closure_t *self, struct cloc loc, dict_t *context,
item_t *i;
cstring_t filename;
FILE *f;
+ struct load_ctx l[1];
+
+ l->verror=verror_cfgfatal;
+ l->postreadcheck=postreadcheck_apply;
+ l->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);
fclose(f);
return new_closure(&st->cl);
}
~ianmdlvl / secnet.git / blobdiff