Subversion Repositories lsh

Compare Revisions

Ignore whitespace Rev 137 → Rev 138

/trunk/debian/changelog
1,3 → 1,10
lsh-utils (2.1-9) unstable; urgency=medium
 
* nettle3.patch: also cast length arguments to nettle_sexp_vformat() to
size_t.
 
-- Magnus Holmgren <holmgren@debian.org> Thu, 25 Feb 2016 00:16:44 +0100
 
lsh-utils (2.1-8) unstable; urgency=low
 
* Build with MIT Kerberos instead of Heimdal (Closes: #806266, #812813).
/trunk/debian/patches/nettle3.patch
268,3 → 268,74
const uint8_t *subexpr = sexp_iterator_subexpr(i, &length);
return subexpr ? ssh_format("%ls", length, subexpr) : NULL;
--- a/src/lsh.c
+++ b/src/lsh.c
@@ -524,8 +524,8 @@ do_lsh_lookup(struct lookup_verifier *c,
}
acl = lsh_string_format_sexp(0, "(acl(entry(subject%l)%l))",
- subject->key_length, subject->key,
- STRING_LD(self->access));
+ (size_t)subject->key_length, subject->key,
+ (size_t)STRING_LD(self->access));
/* FIXME: Seems awkward to pick the acl apart again. */
if (!spki_iterator_first(&i, STRING_LD(acl)))
@@ -540,7 +540,7 @@ do_lsh_lookup(struct lookup_verifier *c,
A_WRITE(self->file,
ssh_format("\n; ACL for host %lz\n"
"%lfS\n",
- self->host, lsh_string_format_sexp(1, "%l", STRING_LD(acl))));
+ self->host, lsh_string_format_sexp(1, "%l", (size_t)STRING_LD(acl))));
lsh_string_free(acl);
}
--- a/src/spki.c
+++ b/src/spki.c
@@ -98,7 +98,7 @@ make_ssh_hostkey_tag(const char *host)
}
tag = lsh_string_format_sexp(0, "(tag(ssh-hostkey%s))",
- STRING_LD(reversed));
+ (size_t)STRING_LD(reversed));
lsh_string_free(reversed);
return tag;
@@ -207,7 +207,7 @@ spki_hash_data(const struct hash_algorit
out = lsh_string_format_sexp(0, "(hash%0s%s)",
"hash", get_atom_name(algorithm_name),
- STRING_LD(digest));
+ (size_t)STRING_LD(digest));
KILL(hash);
lsh_string_free(digest);
@@ -376,13 +376,13 @@ spki_pkcs5_encrypt(struct randomness *r,
value = lsh_string_format_sexp(0, "(password-encrypted%s(Xpkcs5v2%0s"
"(iterations%i)(salt%s))"
"(%0s(iv%s)(data%s)))",
- STRING_LD(label),
+ (size_t)STRING_LD(label),
get_atom_name(prf_name),
iterations,
- STRING_LD(salt),
+ (size_t)STRING_LD(salt),
get_atom_name(crypto_name),
- STRING_LD(iv),
- STRING_LD(encrypted));
+ (size_t)STRING_LD(iv),
+ (size_t)STRING_LD(encrypted));
lsh_string_free(key);
lsh_string_free(salt);
--- a/src/srp_exchange.c
+++ b/src/srp_exchange.c
@@ -112,7 +112,7 @@ srp_make_verifier(const struct zn_group
zn_exp(G, x, G->generator, x);
expr = lsh_string_format_sexp(0, "(srp-verifier ssh-ring1%s%b)",
- STRING_LD(salt),
+ (size_t)STRING_LD(salt),
x);
mpz_clear(x);