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

* src/sexp_commands.c (do_print_raw_hash_to): Use the sexp_format

function, rather than invoking the SSH_FORMAT method directly.
* src/spki_commands.c (do_spki_encrypt): Likewise.

Rev: src/sexp.c:1.29
Rev: src/sexp_commands.c:1.11
Rev: src/spki_commands.c:1.7
parent 305a709a
...@@ -702,9 +702,9 @@ encode_base64_group(UINT32 n, UINT8 *dest) ...@@ -702,9 +702,9 @@ encode_base64_group(UINT32 n, UINT8 *dest)
struct lsh_string * struct lsh_string *
encode_base64(struct lsh_string *s, encode_base64(struct lsh_string *s,
const char *delimiters, const char *delimiters,
unsigned indent UNUSED, unsigned indent UNUSED,
int free) int free)
{ {
UINT32 full_groups = (s->length) / 3; UINT32 full_groups = (s->length) / 3;
unsigned last = (s->length) % 3; unsigned last = (s->length) % 3;
......
...@@ -124,7 +124,7 @@ do_print_raw_hash_to(struct command *s, ...@@ -124,7 +124,7 @@ do_print_raw_hash_to(struct command *s,
CAST(sexp_print_raw_hash_to, self, s); CAST(sexp_print_raw_hash_to, self, s);
CAST_SUBTYPE(sexp, o, a); CAST_SUBTYPE(sexp, o, a);
struct lsh_string *canonical = SEXP_FORMAT(o, SEXP_CANONICAL, 0); struct lsh_string *canonical = sexp_format(o, SEXP_CANONICAL, 0);
struct hash_instance *hash = MAKE_HASH(self->algorithm); struct hash_instance *hash = MAKE_HASH(self->algorithm);
struct lsh_string *digest = lsh_string_alloc(hash->hash_size); struct lsh_string *digest = lsh_string_alloc(hash->hash_size);
......
...@@ -366,7 +366,7 @@ do_spki_encrypt(struct command *s, ...@@ -366,7 +366,7 @@ do_spki_encrypt(struct command *s,
sexp_s(NULL, crypt_string_pad sexp_s(NULL, crypt_string_pad
(MAKE_ENCRYPT(self->algorithm, (MAKE_ENCRYPT(self->algorithm,
self->key->data, iv ? iv->data : noiv), self->key->data, iv ? iv->data : noiv),
SEXP_FORMAT(expr, SEXP_CANONICAL, 0), 1)), sexp_format(expr, SEXP_CANONICAL, 0), 1)),
-1), -1),
-1), -1),
-1)); -1));
......
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