X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=rsa.c;h=9cd12ba4ee0a069967733413e1f0559c5b00ed0b;hb=ffbf811dd1b9e7f390ac2fa497e15764a87694ff;hp=b633f72d9eca65aae395609688a7596bdf7f47ed;hpb=8e4308946bcdb5e62380cff7373d558518745eec;p=secnet.git

diff --git a/rsa.c b/rsa.c
index b633f72..9cd12ba 100644
--- a/rsa.c
+++ b/rsa.c
@@ -49,7 +49,7 @@ struct rsacommon {
 
 struct load_ctx {
     void (*verror)(struct load_ctx *l, struct cloc loc,
-		   FILE *maybe_f, bool_t unsup,
+		   FILE *maybe_f,
 		   const char *message, va_list args);
     bool_t (*postreadcheck)(struct load_ctx *l, FILE *f);
     const char *what;
@@ -63,26 +63,26 @@ struct load_ctx {
 
 static void load_err(struct load_ctx *l,
 		     const struct cloc *maybe_loc, FILE *maybe_f,
-		     bool_t unsup, const char *fmt, ...)
+		     const char *fmt, ...)
 {
     va_list al;
     va_start(al,fmt);
-    l->verror(l, maybe_loc ? *maybe_loc : l->loc, maybe_f,unsup,fmt,al);
+    l->verror(l, maybe_loc ? *maybe_loc : l->loc, maybe_f,fmt,al);
     va_end(al);
 }
 
-FORMAT(printf,5,0)
+FORMAT(printf,4,0)
 static void verror_tryload(struct load_ctx *l, struct cloc loc,
-			   FILE *maybe_f, bool_t unsup,
+			   FILE *maybe_f,
 			   const char *message, va_list args)
 {
-    int class=unsup ? M_DEBUG : M_ERR;
+    int class=M_ERR;
     slilog_part(l->u.tryload.log,class,"%s: ",l->what);
     vslilog(l->u.tryload.log,class,message,args);
 }
 
 static void verror_cfgfatal(struct load_ctx *l, struct cloc loc,
-			    FILE *maybe_f, bool_t unsup,
+			    FILE *maybe_f,
 			    const char *message, va_list args)
 {
     vcfgfatal_maybefile(maybe_f,l->loc,l->what,message,args);
@@ -329,7 +329,7 @@ static void rsapub_dispose(void *sst) {
     const char *en##s, struct cloc en##_loc,
 
 #define LDPUBFATAL(lc,...) ({			\
-	load_err(l,(lc),0,0,__VA_ARGS__);	\
+	load_err(l,(lc),0,__VA_ARGS__);	\
 	goto error_out;				\
     })
 
@@ -441,10 +441,8 @@ bool_t rsa1_loadpub(const struct sigscheme_info *algo,
     return False;
 }
 
-#define LDFATAL(...)      ({ load_err(l,0,0,0,__VA_ARGS__); goto error_out; })
-#define LDUNSUP(...)      ({ load_err(l,0,0,1,__VA_ARGS__); goto error_out; })
-#define LDFATAL_FILE(...) ({ load_err(l,0,f,0,__VA_ARGS__); goto error_out; })
-#define LDUNSUP_FILE(...) ({ load_err(l,0,f,1,__VA_ARGS__); goto error_out; })
+#define LDFATAL(...)      ({ load_err(l,0,0,__VA_ARGS__); goto error_out; })
+#define LDFATAL_FILE(...) ({ load_err(l,0,f,__VA_ARGS__); goto error_out; })
 #define KEYFILE_GET(is)   ({					\
 	uint##is##_t keyfile_get_tmp=keyfile_get_##is(l,f);	\
 	if (!l->postreadcheck(l,f)) goto error_out;		\
@@ -526,7 +524,7 @@ static struct rsapriv *rsa_loadpriv_core(struct load_ctx *l,
     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("failed to read magic ID"
+	LDFATAL_FILE("failed to read magic ID"
 		     " string from SSH1 private keyfile\n");
     }
     FREE(b);
@@ -534,7 +532,7 @@ static struct rsapriv *rsa_loadpriv_core(struct load_ctx *l,
     cipher_type=fgetc(f);
     KEYFILE_GET(32); /* "Reserved data" */
     if (cipher_type != 0) {
-	LDUNSUP("we don't support encrypted keyfiles\n");
+	LDFATAL("we don't support encrypted keyfiles\n");
     }
 
     /* Read the public key */
@@ -712,7 +710,7 @@ error_out:
 static bool_t postreadcheck_tryload(struct load_ctx *l, FILE *f)
 {
     assert(!ferror(f));
-    if (feof(f)) { load_err(l,0,0,0,"eof mid-integer"); return False; }
+    if (feof(f)) { load_err(l,0,0,"eof mid-integer"); return False; }
     return True;
 }