| /tags/2.1-10/debian/patches/blacklist.patch |
|---|
| File deleted |
| Property changes: |
| Deleted: svn:executable |
| ## -1 +0,0 ## |
| -* |
| \ No newline at end of property |
| Index: missing_include.patch |
| =================================================================== |
| --- missing_include.patch (.../trunk/debian/patches) (nonexistent) |
| +++ missing_include.patch (.../tags/2.1-10/debian/patches) (revision 147) |
| @@ -0,0 +1,10 @@ |
| +--- a/src/io_commands.c |
| ++++ b/src/io_commands.c |
| +@@ -36,6 +36,7 @@ |
| + #include "command.h" |
| + #include "connection.h" |
| + /* For lsh_get_cstring */ |
| ++#include "lsh_string.h" |
| + #include "format.h" |
| + #include "io.h" |
| + #include "queue.h" |
| Index: nettle3.patch |
| =================================================================== |
| --- nettle3.patch (.../trunk/debian/patches) (revision 135) |
| +++ nettle3.patch (.../tags/2.1-10/debian/patches) (revision 147) |
| @@ -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); |
| /tags/2.1-10/debian/patches/series |
|---|
| 1,8 → 1,8 |
| sftp-server-mansection.patch |
| blacklist.patch |
| new-readline-completion-function-typedef.patch |
| rl_completion-segfault.patch |
| bsd_connreset_test_fail.patch |
| skip-argp.patch |
| nettle3.patch |
| missing_include.patch |
| mit-kerberos.patch |