diff options
author | Colin Watson <cjwatson@debian.org> | 2014-02-10 00:27:24 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2014-02-10 02:40:28 +0000 |
commit | a2b8818c5d21cfcba443625251f691a2ea3a29c7 (patch) | |
tree | 8fe1fe448cde57eecf71a7bcd57186661b90313f /cipher-chachapoly.h | |
parent | d399ecd8eb7d4aed3b7ba0d2727e619607fb901b (diff) | |
parent | ee8d8b97cc2c6081df3af453a228992b87309ec4 (diff) |
Merge 6.5p1.
* New upstream release (http://www.openssh.com/txt/release-6.5,
LP: #1275068):
- ssh(1): Add support for client-side hostname canonicalisation using a
set of DNS suffixes and rules in ssh_config(5). This allows
unqualified names to be canonicalised to fully-qualified domain names
to eliminate ambiguity when looking up keys in known_hosts or checking
host certificate names (closes: #115286).
Diffstat (limited to 'cipher-chachapoly.h')
-rw-r--r-- | cipher-chachapoly.h | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/cipher-chachapoly.h b/cipher-chachapoly.h new file mode 100644 index 000000000..1628693b2 --- /dev/null +++ b/cipher-chachapoly.h | |||
@@ -0,0 +1,41 @@ | |||
1 | /* $OpenBSD: cipher-chachapoly.h,v 1.1 2013/11/21 00:45:44 djm Exp $ */ | ||
2 | |||
3 | /* | ||
4 | * Copyright (c) Damien Miller 2013 <djm@mindrot.org> | ||
5 | * | ||
6 | * Permission to use, copy, modify, and distribute this software for any | ||
7 | * purpose with or without fee is hereby granted, provided that the above | ||
8 | * copyright notice and this permission notice appear in all copies. | ||
9 | * | ||
10 | * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES | ||
11 | * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF | ||
12 | * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR | ||
13 | * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
14 | * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN | ||
15 | * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | ||
16 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
17 | */ | ||
18 | #ifndef CHACHA_POLY_AEAD_H | ||
19 | #define CHACHA_POLY_AEAD_H | ||
20 | |||
21 | #include <sys/types.h> | ||
22 | #include "chacha.h" | ||
23 | #include "poly1305.h" | ||
24 | |||
25 | #define CHACHA_KEYLEN 32 /* Only 256 bit keys used here */ | ||
26 | |||
27 | struct chachapoly_ctx { | ||
28 | struct chacha_ctx main_ctx, header_ctx; | ||
29 | }; | ||
30 | |||
31 | void chachapoly_init(struct chachapoly_ctx *cpctx, | ||
32 | const u_char *key, u_int keylen) | ||
33 | __attribute__((__bounded__(__buffer__, 2, 3))); | ||
34 | int chachapoly_crypt(struct chachapoly_ctx *cpctx, u_int seqnr, | ||
35 | u_char *dest, const u_char *src, u_int len, u_int aadlen, u_int authlen, | ||
36 | int do_encrypt); | ||
37 | int chachapoly_get_length(struct chachapoly_ctx *cpctx, | ||
38 | u_int *plenp, u_int seqnr, const u_char *cp, u_int len) | ||
39 | __attribute__((__bounded__(__buffer__, 4, 5))); | ||
40 | |||
41 | #endif /* CHACHA_POLY_AEAD_H */ | ||