Commit 635f576c authored by Niels Möller's avatar Niels Möller
Browse files

*** empty log message ***

Rev: src/lsh.c:1.154
Rev: src/sexp_commands.c:1.25
Rev: src/sexp_commands.h:1.11
Rev: src/spki_commands.c:1.31
Rev: src/spki_commands.h:1.14
parent 84d73921
......@@ -370,6 +370,8 @@ read_user_keys(struct lsh_options *options)
}
}
/* FIXME: Call read_user_key directly from main instead. */
/* Read user's private keys. By default, "~/.lsh/identity". */
static void
do_options2identities(struct command *ignored UNUSED,
......
......@@ -25,6 +25,8 @@
#include "sexp_commands.h"
#warning sexp_commands.c is obsolete
#include "format.h"
#include "io.h"
#include "read_file.h"
......@@ -41,7 +43,7 @@ static struct catch_command catch_sexp_exceptions;
static struct read_sexp_command read_sexp;
#define READ_SEXP (&read_sexp.super.super)
#if 0
#define GABA_DEFINE
#include "sexp_commands.h.x"
#undef GABA_DEFINE
......@@ -202,3 +204,4 @@ DEFINE_COMMAND(for_sexp_command)
CAST_SUBTYPE(command, handler, a);
COMMAND_RETURN(c, for_sexp(handler));
}
#endif
......@@ -26,7 +26,7 @@
#ifndef SEXP_COMMANDS_H_INCLUDED
#define SEXP_COMMANDS_H_INCLUDED
#warning sexp_commands.h is soon to be obsolete
#warning sexp_commands.h is obsolete
#include "abstract_crypto.h"
#include "abstract_io.h"
......
......@@ -24,6 +24,7 @@
*/
#include "spki_commands.h"
#warning spki_commands.h is obsolete
#include "atoms.h"
#include "crypto.h"
......@@ -53,14 +54,13 @@ struct command spki_add_userkey_command;
#define SPKI_ADD_USERKEY (&spki_add_userkey_command.super)
#include "spki_commands.c.x"
#define SA(x) sexp_a(ATOM_##x)
#define SPKI_ERROR(e, msg, expr) \
EXCEPTION_RAISE((e), make_spki_exception(EXC_SPKI_TYPE, (msg), (expr)))
#if 0
/* Reading keys */
/* FIXME: Used only by sexp2keypair, move code there? */
......@@ -159,6 +159,7 @@ DEFINE_COMMAND2(spki_sexp2keypair_command)
/* Reading of ACL:s
* ****************/
#endif
DEFINE_COMMAND(spki_make_context_command)
(struct command *s UNUSED,
......@@ -183,7 +184,7 @@ DEFINE_COMMAND(spki_make_context_command)
(vars
(keys object alist)))
*/
#if 0
static void
do_spki_add_hostkey(struct command *s,
struct lsh_object *a,
......@@ -231,7 +232,7 @@ DEFINE_COMMAND(spki_return_hostkeys)
COMMAND_RETURN(c, self->keys);
}
/* GABA:
/* ;;GABA:
(expr
(name spki_read_hostkeys)
(params
......@@ -261,4 +262,5 @@ DEFINE_COMMAND(spki_read_hostkeys_command)
COMMAND_RETURN(c, res);
}
#endif
......@@ -24,18 +24,11 @@
#ifndef LSH_SPKI_COMMANDS_H_INCLUDED
#define LSH_SPKI_COMMANDS_H_INCLUDED
#warning spki_commands.h is obsolete
#include "command.h"
#include "interact.h"
#include "spki.h"
extern struct command spki_signer2verifier;
#define SIGNER2VERIFIER (&spki_signer2verifier.super)
extern struct command spki_verifier2public;
#define VERIFIER2PUBLIC (&spki_verifier2public.super)
extern struct command_2 spki_sexp2signer_command;
#define SEXP2SIGNER (&spki_sexp2signer_command.super.super)
extern struct command_2 spki_sexp2keypair_command;
#define SEXP2KEYPAIR (&spki_sexp2keypair_command.super.super)
......@@ -46,12 +39,6 @@ extern struct command spki_make_context_command;
extern struct command spki_read_hostkeys_command;
#define SPKI_READ_HOSTKEYS (&spki_read_hostkeys_command.super)
struct command *
make_spki_hash(int name, struct hash_algorithm *algorithm);
struct command *
make_spki_read_acls(struct alist *algorithms);
struct command *
make_spki_read_userkeys(struct alist *algorithms,
struct alist *signature_algorithms,
......@@ -59,16 +46,6 @@ make_spki_read_userkeys(struct alist *algorithms,
/* Encryption of private data. */
struct command *
make_pkcs5_encrypt(struct randomness *r,
struct lsh_string *label,
UINT32 prf_name,
struct mac_algorithm *prf,
int crypto_name,
struct crypto_algorithm *crypto,
UINT32 salt_length,
struct lsh_string *password,
UINT32 iterations);
struct command *
make_pkcs5_decrypt(struct alist *mac_algorithms,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment