#include <bsd/sys/queue.h>
+#include "osdep.h"
+
#define MAX_PEER_ADDRS 5
/* send at most this many copies; honour at most that many addresses */
typedef bool_t sigscheme_loadpub(const struct sigscheme_info *algo,
struct buffer_if *pubkeydata,
struct sigpubkey_if **sigpub_r,
- struct log_if *log);
+ closure_t **closure_r,
+ struct log_if *log, struct cloc loc);
/* pubkeydata is (supposedly) for this algorithm.
* loadpub should log an error if it fails.
- * pubkeydata may be modified (but not freed) */
+ * pubkeydata may be modified (but not freed).
+ * both *sigpub_r and *closure_r must always be written and must
+ * refer to the same object, so on successful return
+ * (*closure_r)->type==CL_SIGPUBKEY
+ * and (*closure_r)->interface==*sigpub_r */
typedef bool_t sigscheme_loadpriv(const struct sigscheme_info *algo,
struct buffer_if *privkeydata,
struct sigprivkey_if **sigpriv_r,
- struct log_if *log);
- /* privkeydata may contain data for any algorithm, not necessarily
- * this one! If it is not for this algorithm, return False and do
- * not log anything (other than at M_DEBUG). If it *is* for this
- * algorithm but is wrong, log at M_ERROR.
- * On entry privkeydata->base==start. loadpriv may modify base and
- * size, but not anything else. So it may use unprepend and
- * unappend. */
+ struct log_if *log, struct cloc loc);
+ /* Ideally, check whether privkeydata contains data for any algorithm.
+ * That avoids security problems if a key file is misidentified (which
+ * might happen if the file is simply renamed).
+ * If there is an error (including that the key data is not for this
+ * algorithm, return False and log an error at M_ERROR.
+ * On entry privkeydata->base==start. loadpriv may modify
+ * privkeydata, including the contents. */
struct sigscheme_info {
const char *name;
extern const struct sigscheme_info rsa1_sigscheme;
extern const struct sigscheme_info sigschemes[]; /* sentinel has name==0 */
+const struct sigscheme_info *sigscheme_lookup(const char *name);
+
+extern sigscheme_loadpriv rsa1_loadpriv;
+extern sigscheme_loadpub rsa1_loadpub;
+
/***** END of signature schemes *****/
/***** CLOSURE TYPES and interface definitions *****/