* 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

src/sexp.c

@@ -702,9 +702,9 @@ encode_base64_group(UINT32 n, UINT8 *dest)
 
 struct lsh_string *
 encode_base64(struct lsh_string *s,
-				 const char *delimiters,
-				 unsigned indent UNUSED,
-				 int free)				 
+	      const char *delimiters,
+	      unsigned indent UNUSED,
+	      int free)				 
 {
   UINT32 full_groups = (s->length) / 3;
   unsigned last = (s->length) % 3;

src/sexp_commands.c

@@ -124,7 +124,7 @@ do_print_raw_hash_to(struct command *s,
   CAST(sexp_print_raw_hash_to, self, s);
   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 lsh_string *digest = lsh_string_alloc(hash->hash_size);
 

src/spki_commands.c

@@ -366,7 +366,7 @@ do_spki_encrypt(struct command *s,
 				      sexp_s(NULL, crypt_string_pad
 					     (MAKE_ENCRYPT(self->algorithm,
 							   self->key->data, iv ? iv->data : noiv),
-					      SEXP_FORMAT(expr, SEXP_CANONICAL, 0), 1)),
+					      sexp_format(expr, SEXP_CANONICAL, 0), 1)),
 				      -1),
 			       -1),
 			-1));