Commit 4833f22b authored by Niels Möller's avatar Niels Möller
Browse files

* src/channel_commands.c, src/channel_commands.h: Use ints to represent atoms.

* src/gateway_channel.c (make_gateway_channel_open_command): Likewise.
* src/lsh_writekey.c: Likewise.
* src/proxy.c: Likewise.
* src/server_publickey.c: Likewise.
* src/spki.c (spki_get_type):
* src/spki_commands.c (make_pkcs5_encrypt):

Rev: src/spki.c:1.21
Rev: src/spki_commands.c:1.9
Rev: src/spki_commands.h:1.5
parent 33967651
...@@ -124,7 +124,7 @@ dsa_to_spki_public_key(struct dsa_public *dsa) ...@@ -124,7 +124,7 @@ dsa_to_spki_public_key(struct dsa_public *dsa)
int spki_get_type(struct sexp *e, struct sexp_iterator **res) int spki_get_type(struct sexp *e, struct sexp_iterator **res)
{ {
struct sexp_iterator *i; struct sexp_iterator *i;
UINT32 type; int type;
if (sexp_atomp(e) || sexp_nullp(e)) if (sexp_atomp(e) || sexp_nullp(e))
return 0; return 0;
......
...@@ -323,7 +323,7 @@ COMMAND_SIMPLE(spki_read_userkeys_command) ...@@ -323,7 +323,7 @@ COMMAND_SIMPLE(spki_read_userkeys_command)
(vars (vars
(label string) (label string)
(method object sexp) (method object sexp)
(algorithm_name . UINT32) (algorithm_name . int)
(algorithm object crypto_algorithm) (algorithm object crypto_algorithm)
(r object randomness) (r object randomness)
(key string))) (key string)))
...@@ -371,7 +371,7 @@ make_pkcs5_encrypt(struct randomness *r, ...@@ -371,7 +371,7 @@ make_pkcs5_encrypt(struct randomness *r,
struct lsh_string *label, struct lsh_string *label,
UINT32 prf_name, UINT32 prf_name,
struct mac_algorithm *prf, struct mac_algorithm *prf,
UINT32 crypto_name, int crypto_name,
struct crypto_algorithm *crypto, struct crypto_algorithm *crypto,
UINT32 salt_length, UINT32 salt_length,
struct lsh_string *password, struct lsh_string *password,
......
...@@ -51,7 +51,7 @@ make_pkcs5_encrypt(struct randomness *r, ...@@ -51,7 +51,7 @@ make_pkcs5_encrypt(struct randomness *r,
struct lsh_string *label, struct lsh_string *label,
UINT32 prf_name, UINT32 prf_name,
struct mac_algorithm *prf, struct mac_algorithm *prf,
UINT32 crypto_name, int crypto_name,
struct crypto_algorithm *crypto, struct crypto_algorithm *crypto,
UINT32 salt_length, UINT32 salt_length,
struct lsh_string *password, struct lsh_string *password,
......
Supports Markdown
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