diff options
Diffstat (limited to 'src/lib/libcrypto/chacha/chacha.c')
-rw-r--r-- | src/lib/libcrypto/chacha/chacha.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/lib/libcrypto/chacha/chacha.c b/src/lib/libcrypto/chacha/chacha.c index 0c384ab88a..6a2dddf055 100644 --- a/src/lib/libcrypto/chacha/chacha.c +++ b/src/lib/libcrypto/chacha/chacha.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: chacha.c,v 1.7 2015/12/09 14:07:55 bcook Exp $ */ | 1 | /* $OpenBSD: chacha.c,v 1.8 2019/01/22 00:59:21 dlg Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -75,3 +75,13 @@ CRYPTO_chacha_20(unsigned char *out, const unsigned char *in, size_t len, | |||
75 | 75 | ||
76 | chacha_encrypt_bytes(&ctx, in, out, (uint32_t)len); | 76 | chacha_encrypt_bytes(&ctx, in, out, (uint32_t)len); |
77 | } | 77 | } |
78 | |||
79 | void | ||
80 | CRYPTO_xchacha_20(unsigned char *out, const unsigned char *in, size_t len, | ||
81 | const unsigned char key[32], const unsigned char iv[24]) | ||
82 | { | ||
83 | uint8_t subkey[32]; | ||
84 | |||
85 | CRYPTO_hchacha_20(subkey, key, iv); | ||
86 | CRYPTO_chacha_20(out, in, len, subkey, iv + 16, 0); | ||
87 | } | ||