diff options
Diffstat (limited to 'digest.h')
-rw-r--r-- | digest.h | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: digest.h,v 1.2 2014/01/27 18:58:14 markus Exp $ */ | 1 | /* $OpenBSD: digest.h,v 1.6 2014/07/03 04:36:45 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2013 Damien Miller <djm@mindrot.org> | 3 | * Copyright (c) 2013 Damien Miller <djm@mindrot.org> |
4 | * | 4 | * |
@@ -30,6 +30,7 @@ | |||
30 | #define SSH_DIGEST_SHA512 5 | 30 | #define SSH_DIGEST_SHA512 5 |
31 | #define SSH_DIGEST_MAX 6 | 31 | #define SSH_DIGEST_MAX 6 |
32 | 32 | ||
33 | struct sshbuf; | ||
33 | struct ssh_digest_ctx; | 34 | struct ssh_digest_ctx; |
34 | 35 | ||
35 | /* Returns the algorithm's digest length in bytes or 0 for invalid algorithm */ | 36 | /* Returns the algorithm's digest length in bytes or 0 for invalid algorithm */ |
@@ -47,14 +48,15 @@ int ssh_digest_memory(int alg, const void *m, size_t mlen, | |||
47 | u_char *d, size_t dlen) | 48 | u_char *d, size_t dlen) |
48 | __attribute__((__bounded__(__buffer__, 2, 3))) | 49 | __attribute__((__bounded__(__buffer__, 2, 3))) |
49 | __attribute__((__bounded__(__buffer__, 4, 5))); | 50 | __attribute__((__bounded__(__buffer__, 4, 5))); |
50 | int ssh_digest_buffer(int alg, const Buffer *b, u_char *d, size_t dlen) | 51 | int ssh_digest_buffer(int alg, const struct sshbuf *b, u_char *d, size_t dlen) |
51 | __attribute__((__bounded__(__buffer__, 3, 4))); | 52 | __attribute__((__bounded__(__buffer__, 3, 4))); |
52 | 53 | ||
53 | /* Update API */ | 54 | /* Update API */ |
54 | struct ssh_digest_ctx *ssh_digest_start(int alg); | 55 | struct ssh_digest_ctx *ssh_digest_start(int alg); |
55 | int ssh_digest_update(struct ssh_digest_ctx *ctx, const void *m, size_t mlen) | 56 | int ssh_digest_update(struct ssh_digest_ctx *ctx, const void *m, size_t mlen) |
56 | __attribute__((__bounded__(__buffer__, 2, 3))); | 57 | __attribute__((__bounded__(__buffer__, 2, 3))); |
57 | int ssh_digest_update_buffer(struct ssh_digest_ctx *ctx, const Buffer *b); | 58 | int ssh_digest_update_buffer(struct ssh_digest_ctx *ctx, |
59 | const struct sshbuf *b); | ||
58 | int ssh_digest_final(struct ssh_digest_ctx *ctx, u_char *d, size_t dlen) | 60 | int ssh_digest_final(struct ssh_digest_ctx *ctx, u_char *d, size_t dlen) |
59 | __attribute__((__bounded__(__buffer__, 2, 3))); | 61 | __attribute__((__bounded__(__buffer__, 2, 3))); |
60 | void ssh_digest_free(struct ssh_digest_ctx *ctx); | 62 | void ssh_digest_free(struct ssh_digest_ctx *ctx); |