diff options
author | Colin Watson <cjwatson@debian.org> | 2013-09-14 23:42:11 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-09-14 23:42:11 +0100 |
commit | 327155e6824b3ee13837bdde04e4eb47e147ff46 (patch) | |
tree | 8f8743122403c7a2e6ed919156711fb1520c657f /umac.h | |
parent | 0334ce32304e9ba2a10ee5ca49ca6e8ff3ba6cf4 (diff) | |
parent | 74e339b8f8936bc0d985e053a076d0c9b5e9ea51 (diff) |
* New upstream release (http://www.openssh.com/txt/release-6.3).
- sftp(1): add support for resuming partial downloads using the "reget"
command and on the sftp commandline or on the "get" commandline using
the "-a" (append) option (closes: #158590).
- ssh(1): add an "IgnoreUnknown" configuration option to selectively
suppress errors arising from unknown configuration directives (closes:
#436052).
- sftp(1): update progressmeter when data is acknowledged, not when it's
sent (partially addresses #708372).
- ssh(1): do not fatally exit when attempting to cleanup multiplexing-
created channels that are incompletely opened (closes: #651357).
Diffstat (limited to 'umac.h')
-rw-r--r-- | umac.h | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: umac.h,v 1.2 2012/10/04 13:21:50 markus Exp $ */ | 1 | /* $OpenBSD: umac.h,v 1.3 2013/07/22 12:20:02 djm Exp $ */ |
2 | /* ----------------------------------------------------------------------- | 2 | /* ----------------------------------------------------------------------- |
3 | * | 3 | * |
4 | * umac.h -- C Implementation UMAC Message Authentication | 4 | * umac.h -- C Implementation UMAC Message Authentication |
@@ -52,7 +52,7 @@ | |||
52 | extern "C" { | 52 | extern "C" { |
53 | #endif | 53 | #endif |
54 | 54 | ||
55 | struct umac_ctx *umac_new(u_char key[]); | 55 | struct umac_ctx *umac_new(const u_char key[]); |
56 | /* Dynamically allocate a umac_ctx struct, initialize variables, | 56 | /* Dynamically allocate a umac_ctx struct, initialize variables, |
57 | * generate subkeys from key. | 57 | * generate subkeys from key. |
58 | */ | 58 | */ |
@@ -62,10 +62,10 @@ int umac_reset(struct umac_ctx *ctx); | |||
62 | /* Reset a umac_ctx to begin authenicating a new message */ | 62 | /* Reset a umac_ctx to begin authenicating a new message */ |
63 | #endif | 63 | #endif |
64 | 64 | ||
65 | int umac_update(struct umac_ctx *ctx, u_char *input, long len); | 65 | int umac_update(struct umac_ctx *ctx, const u_char *input, long len); |
66 | /* Incorporate len bytes pointed to by input into context ctx */ | 66 | /* Incorporate len bytes pointed to by input into context ctx */ |
67 | 67 | ||
68 | int umac_final(struct umac_ctx *ctx, u_char tag[], u_char nonce[8]); | 68 | int umac_final(struct umac_ctx *ctx, u_char tag[], const u_char nonce[8]); |
69 | /* Incorporate any pending data and the ctr value, and return tag. | 69 | /* Incorporate any pending data and the ctr value, and return tag. |
70 | * This function returns error code if ctr < 0. | 70 | * This function returns error code if ctr < 0. |
71 | */ | 71 | */ |
@@ -117,9 +117,9 @@ int uhash(uhash_ctx_t ctx, | |||
117 | #endif | 117 | #endif |
118 | 118 | ||
119 | /* matching umac-128 API, we reuse umac_ctx, since it's opaque */ | 119 | /* matching umac-128 API, we reuse umac_ctx, since it's opaque */ |
120 | struct umac_ctx *umac128_new(u_char key[]); | 120 | struct umac_ctx *umac128_new(const u_char key[]); |
121 | int umac128_update(struct umac_ctx *ctx, u_char *input, long len); | 121 | int umac128_update(struct umac_ctx *ctx, const u_char *input, long len); |
122 | int umac128_final(struct umac_ctx *ctx, u_char tag[], u_char nonce[8]); | 122 | int umac128_final(struct umac_ctx *ctx, u_char tag[], const u_char nonce[8]); |
123 | int umac128_delete(struct umac_ctx *ctx); | 123 | int umac128_delete(struct umac_ctx *ctx); |
124 | 124 | ||
125 | #ifdef __cplusplus | 125 | #ifdef __cplusplus |