tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2013/12/15 21:42:35 

[cipher-chachapoly.c]
     add some comments and constify a constant
This commit is contained in:
Damien Miller 2013-12-18 17:50:13 +11:00
parent 059321d19a
commit d58a596442
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -25,6 +25,9 @@
[ssh-add.c] [ssh-add.c]
Make ssh-add also add .ssh/id_ed25519; fixes lie in manual page. Make ssh-add also add .ssh/id_ed25519; fixes lie in manual page.
ok markus@ ok markus@
- djm@cvs.openbsd.org 2013/12/15 21:42:35
[cipher-chachapoly.c]
add some comments and constify a constant
20131208 20131208
- (djm) [openbsd-compat/bsd-setres_id.c] Missing header; from Corinna - (djm) [openbsd-compat/bsd-setres_id.c] Missing header; from Corinna

20
cipher-chachapoly.c
View File

@ -14,7 +14,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $OpenBSD: cipher-chachapoly.c,v 1.2 2013/11/21 02:50:00 djm Exp $ */ /* $OpenBSD: cipher-chachapoly.c,v 1.3 2013/12/15 21:42:35 djm Exp $ */
#include "includes.h" #include "includes.h"
@ -38,20 +38,19 @@ void chachapoly_init(struct chachapoly_ctx *ctx,
/* /*
* chachapoly_crypt() operates as following: * chachapoly_crypt() operates as following:
* Copy 'aadlen' bytes (without en/decryption) from 'src' to 'dest'. * En/decrypt with header key 'aadlen' bytes from 'src', storing result
* Theses bytes are treated as additional authenticated data. * to 'dest'. The ciphertext here is treated as additional authenticated
* En/Decrypt 'len' bytes at offset 'aadlen' from 'src' to 'dest'. * data for MAC calculation.
* Use POLY1305_TAGLEN bytes at offset 'len'+'aadlen' as the * En/decrypt 'len' bytes at offset 'aadlen' from 'src' to 'dest'. Use
* authentication tag. * POLY1305_TAGLEN bytes at offset 'len'+'aadlen' as the authentication
* This tag is written on encryption and verified on decryption. * tag. This tag is written on encryption and verified on decryption.
* Both 'aadlen' and 'authlen' can be set to 0.
*/ */
int int
chachapoly_crypt(struct chachapoly_ctx *ctx, u_int seqnr, u_char *dest, chachapoly_crypt(struct chachapoly_ctx *ctx, u_int seqnr, u_char *dest,
const u_char *src, u_int len, u_int aadlen, u_int authlen, int do_encrypt) const u_char *src, u_int len, u_int aadlen, u_int authlen, int do_encrypt)
{ {
u_char seqbuf[8]; u_char seqbuf[8];
u_char one[8] = { 1, 0, 0, 0, 0, 0, 0, 0 }; /* NB. little-endian */ const u_char one[8] = { 1, 0, 0, 0, 0, 0, 0, 0 }; /* NB little-endian */
u_char expected_tag[POLY1305_TAGLEN], poly_key[POLY1305_KEYLEN]; u_char expected_tag[POLY1305_TAGLEN], poly_key[POLY1305_KEYLEN];
int r = -1; int r = -1;
@ -76,7 +75,7 @@ chachapoly_crypt(struct chachapoly_ctx *ctx, u_int seqnr, u_char *dest,
goto out; goto out;
} }
/* Crypt additional data */ /* Crypt additional data */
if (aadlen) { if (aadlen) {
chacha_ivsetup(&ctx->header_ctx, seqbuf, NULL); chacha_ivsetup(&ctx->header_ctx, seqbuf, NULL);
chacha_encrypt_bytes(&ctx->header_ctx, src, dest, aadlen); chacha_encrypt_bytes(&ctx->header_ctx, src, dest, aadlen);
} }
@ -97,6 +96,7 @@ chachapoly_crypt(struct chachapoly_ctx *ctx, u_int seqnr, u_char *dest,
return r; return r;
} }
/* Decrypt and extract the encrypted packet length */
int int
chachapoly_get_length(struct chachapoly_ctx *ctx, chachapoly_get_length(struct chachapoly_ctx *ctx,
u_int *plenp, u_int seqnr, const u_char *cp, u_int len) u_int *plenp, u_int seqnr, const u_char *cp, u_int len)