~ [ source navigation ] ~ [ diff markup ] ~ [ identifier search ] ~

TOMOYO Linux Cross Reference
Linux/lib/crypto/chacha.c

Version: ~ [ linux-6.12-rc7 ] ~ [ linux-6.11.7 ] ~ [ linux-6.10.14 ] ~ [ linux-6.9.12 ] ~ [ linux-6.8.12 ] ~ [ linux-6.7.12 ] ~ [ linux-6.6.60 ] ~ [ linux-6.5.13 ] ~ [ linux-6.4.16 ] ~ [ linux-6.3.13 ] ~ [ linux-6.2.16 ] ~ [ linux-6.1.116 ] ~ [ linux-6.0.19 ] ~ [ linux-5.19.17 ] ~ [ linux-5.18.19 ] ~ [ linux-5.17.15 ] ~ [ linux-5.16.20 ] ~ [ linux-5.15.171 ] ~ [ linux-5.14.21 ] ~ [ linux-5.13.19 ] ~ [ linux-5.12.19 ] ~ [ linux-5.11.22 ] ~ [ linux-5.10.229 ] ~ [ linux-5.9.16 ] ~ [ linux-5.8.18 ] ~ [ linux-5.7.19 ] ~ [ linux-5.6.19 ] ~ [ linux-5.5.19 ] ~ [ linux-5.4.285 ] ~ [ linux-5.3.18 ] ~ [ linux-5.2.21 ] ~ [ linux-5.1.21 ] ~ [ linux-5.0.21 ] ~ [ linux-4.20.17 ] ~ [ linux-4.19.323 ] ~ [ linux-4.18.20 ] ~ [ linux-4.17.19 ] ~ [ linux-4.16.18 ] ~ [ linux-4.15.18 ] ~ [ linux-4.14.336 ] ~ [ linux-4.13.16 ] ~ [ linux-4.12.14 ] ~ [ linux-4.11.12 ] ~ [ linux-4.10.17 ] ~ [ linux-4.9.337 ] ~ [ linux-4.4.302 ] ~ [ linux-3.10.108 ] ~ [ linux-2.6.32.71 ] ~ [ linux-2.6.0 ] ~ [ linux-2.4.37.11 ] ~ [ unix-v6-master ] ~ [ ccs-tools-1.8.12 ] ~ [ policy-sample ] ~
Architecture: ~ [ i386 ] ~ [ alpha ] ~ [ m68k ] ~ [ mips ] ~ [ ppc ] ~ [ sparc ] ~ [ sparc64 ] ~

Diff markup

Differences between /lib/crypto/chacha.c (Version linux-6.12-rc7) and /lib/crypto/chacha.c (Version linux-5.7.19)


  1 // SPDX-License-Identifier: GPL-2.0-or-later        1 // SPDX-License-Identifier: GPL-2.0-or-later
  2 /*                                                  2 /*
  3  * The "hash function" used as the core of the      3  * The "hash function" used as the core of the ChaCha stream cipher (RFC7539)
  4  *                                                  4  *
  5  * Copyright (C) 2015 Martin Willi                  5  * Copyright (C) 2015 Martin Willi
  6  */                                                 6  */
  7                                                     7 
  8 #include <linux/bug.h>                              8 #include <linux/bug.h>
  9 #include <linux/kernel.h>                           9 #include <linux/kernel.h>
 10 #include <linux/export.h>                          10 #include <linux/export.h>
 11 #include <linux/bitops.h>                          11 #include <linux/bitops.h>
 12 #include <linux/string.h>                          12 #include <linux/string.h>
 13 #include <linux/unaligned.h>                   !!  13 #include <linux/cryptohash.h>
                                                   >>  14 #include <asm/unaligned.h>
 14 #include <crypto/chacha.h>                         15 #include <crypto/chacha.h>
 15                                                    16 
 16 static void chacha_permute(u32 *x, int nrounds     17 static void chacha_permute(u32 *x, int nrounds)
 17 {                                                  18 {
 18         int i;                                     19         int i;
 19                                                    20 
 20         /* whitelist the allowed round counts      21         /* whitelist the allowed round counts */
 21         WARN_ON_ONCE(nrounds != 20 && nrounds      22         WARN_ON_ONCE(nrounds != 20 && nrounds != 12);
 22                                                    23 
 23         for (i = 0; i < nrounds; i += 2) {         24         for (i = 0; i < nrounds; i += 2) {
 24                 x[0]  += x[4];    x[12] = rol3     25                 x[0]  += x[4];    x[12] = rol32(x[12] ^ x[0],  16);
 25                 x[1]  += x[5];    x[13] = rol3     26                 x[1]  += x[5];    x[13] = rol32(x[13] ^ x[1],  16);
 26                 x[2]  += x[6];    x[14] = rol3     27                 x[2]  += x[6];    x[14] = rol32(x[14] ^ x[2],  16);
 27                 x[3]  += x[7];    x[15] = rol3     28                 x[3]  += x[7];    x[15] = rol32(x[15] ^ x[3],  16);
 28                                                    29 
 29                 x[8]  += x[12];   x[4]  = rol3     30                 x[8]  += x[12];   x[4]  = rol32(x[4]  ^ x[8],  12);
 30                 x[9]  += x[13];   x[5]  = rol3     31                 x[9]  += x[13];   x[5]  = rol32(x[5]  ^ x[9],  12);
 31                 x[10] += x[14];   x[6]  = rol3     32                 x[10] += x[14];   x[6]  = rol32(x[6]  ^ x[10], 12);
 32                 x[11] += x[15];   x[7]  = rol3     33                 x[11] += x[15];   x[7]  = rol32(x[7]  ^ x[11], 12);
 33                                                    34 
 34                 x[0]  += x[4];    x[12] = rol3     35                 x[0]  += x[4];    x[12] = rol32(x[12] ^ x[0],   8);
 35                 x[1]  += x[5];    x[13] = rol3     36                 x[1]  += x[5];    x[13] = rol32(x[13] ^ x[1],   8);
 36                 x[2]  += x[6];    x[14] = rol3     37                 x[2]  += x[6];    x[14] = rol32(x[14] ^ x[2],   8);
 37                 x[3]  += x[7];    x[15] = rol3     38                 x[3]  += x[7];    x[15] = rol32(x[15] ^ x[3],   8);
 38                                                    39 
 39                 x[8]  += x[12];   x[4]  = rol3     40                 x[8]  += x[12];   x[4]  = rol32(x[4]  ^ x[8],   7);
 40                 x[9]  += x[13];   x[5]  = rol3     41                 x[9]  += x[13];   x[5]  = rol32(x[5]  ^ x[9],   7);
 41                 x[10] += x[14];   x[6]  = rol3     42                 x[10] += x[14];   x[6]  = rol32(x[6]  ^ x[10],  7);
 42                 x[11] += x[15];   x[7]  = rol3     43                 x[11] += x[15];   x[7]  = rol32(x[7]  ^ x[11],  7);
 43                                                    44 
 44                 x[0]  += x[5];    x[15] = rol3     45                 x[0]  += x[5];    x[15] = rol32(x[15] ^ x[0],  16);
 45                 x[1]  += x[6];    x[12] = rol3     46                 x[1]  += x[6];    x[12] = rol32(x[12] ^ x[1],  16);
 46                 x[2]  += x[7];    x[13] = rol3     47                 x[2]  += x[7];    x[13] = rol32(x[13] ^ x[2],  16);
 47                 x[3]  += x[4];    x[14] = rol3     48                 x[3]  += x[4];    x[14] = rol32(x[14] ^ x[3],  16);
 48                                                    49 
 49                 x[10] += x[15];   x[5]  = rol3     50                 x[10] += x[15];   x[5]  = rol32(x[5]  ^ x[10], 12);
 50                 x[11] += x[12];   x[6]  = rol3     51                 x[11] += x[12];   x[6]  = rol32(x[6]  ^ x[11], 12);
 51                 x[8]  += x[13];   x[7]  = rol3     52                 x[8]  += x[13];   x[7]  = rol32(x[7]  ^ x[8],  12);
 52                 x[9]  += x[14];   x[4]  = rol3     53                 x[9]  += x[14];   x[4]  = rol32(x[4]  ^ x[9],  12);
 53                                                    54 
 54                 x[0]  += x[5];    x[15] = rol3     55                 x[0]  += x[5];    x[15] = rol32(x[15] ^ x[0],   8);
 55                 x[1]  += x[6];    x[12] = rol3     56                 x[1]  += x[6];    x[12] = rol32(x[12] ^ x[1],   8);
 56                 x[2]  += x[7];    x[13] = rol3     57                 x[2]  += x[7];    x[13] = rol32(x[13] ^ x[2],   8);
 57                 x[3]  += x[4];    x[14] = rol3     58                 x[3]  += x[4];    x[14] = rol32(x[14] ^ x[3],   8);
 58                                                    59 
 59                 x[10] += x[15];   x[5]  = rol3     60                 x[10] += x[15];   x[5]  = rol32(x[5]  ^ x[10],  7);
 60                 x[11] += x[12];   x[6]  = rol3     61                 x[11] += x[12];   x[6]  = rol32(x[6]  ^ x[11],  7);
 61                 x[8]  += x[13];   x[7]  = rol3     62                 x[8]  += x[13];   x[7]  = rol32(x[7]  ^ x[8],   7);
 62                 x[9]  += x[14];   x[4]  = rol3     63                 x[9]  += x[14];   x[4]  = rol32(x[4]  ^ x[9],   7);
 63         }                                          64         }
 64 }                                                  65 }
 65                                                    66 
 66 /**                                                67 /**
 67  * chacha_block_generic - generate one keystre !!  68  * chacha_block - generate one keystream block and increment block counter
 68  * @state: input state matrix (16 32-bit words     69  * @state: input state matrix (16 32-bit words)
 69  * @stream: output keystream block (64 bytes)      70  * @stream: output keystream block (64 bytes)
 70  * @nrounds: number of rounds (20 or 12; 20 is     71  * @nrounds: number of rounds (20 or 12; 20 is recommended)
 71  *                                                 72  *
 72  * This is the ChaCha core, a function from 64     73  * This is the ChaCha core, a function from 64-byte strings to 64-byte strings.
 73  * The caller has already converted the endian     74  * The caller has already converted the endianness of the input.  This function
 74  * also handles incrementing the block counter     75  * also handles incrementing the block counter in the input matrix.
 75  */                                                76  */
 76 void chacha_block_generic(u32 *state, u8 *stre     77 void chacha_block_generic(u32 *state, u8 *stream, int nrounds)
 77 {                                                  78 {
 78         u32 x[16];                                 79         u32 x[16];
 79         int i;                                     80         int i;
 80                                                    81 
 81         memcpy(x, state, 64);                      82         memcpy(x, state, 64);
 82                                                    83 
 83         chacha_permute(x, nrounds);                84         chacha_permute(x, nrounds);
 84                                                    85 
 85         for (i = 0; i < ARRAY_SIZE(x); i++)        86         for (i = 0; i < ARRAY_SIZE(x); i++)
 86                 put_unaligned_le32(x[i] + stat     87                 put_unaligned_le32(x[i] + state[i], &stream[i * sizeof(u32)]);
 87                                                    88 
 88         state[12]++;                               89         state[12]++;
 89 }                                                  90 }
 90 EXPORT_SYMBOL(chacha_block_generic);               91 EXPORT_SYMBOL(chacha_block_generic);
 91                                                    92 
 92 /**                                                93 /**
 93  * hchacha_block_generic - abbreviated ChaCha      94  * hchacha_block_generic - abbreviated ChaCha core, for XChaCha
 94  * @state: input state matrix (16 32-bit words     95  * @state: input state matrix (16 32-bit words)
 95  * @stream: output (8 32-bit words)            !!  96  * @out: output (8 32-bit words)
 96  * @nrounds: number of rounds (20 or 12; 20 is     97  * @nrounds: number of rounds (20 or 12; 20 is recommended)
 97  *                                                 98  *
 98  * HChaCha is the ChaCha equivalent of HSalsa      99  * HChaCha is the ChaCha equivalent of HSalsa and is an intermediate step
 99  * towards XChaCha (see https://cr.yp.to/snuff    100  * towards XChaCha (see https://cr.yp.to/snuffle/xsalsa-20081128.pdf).  HChaCha
100  * skips the final addition of the initial sta    101  * skips the final addition of the initial state, and outputs only certain words
101  * of the state.  It should not be used for st    102  * of the state.  It should not be used for streaming directly.
102  */                                               103  */
103 void hchacha_block_generic(const u32 *state, u    104 void hchacha_block_generic(const u32 *state, u32 *stream, int nrounds)
104 {                                                 105 {
105         u32 x[16];                                106         u32 x[16];
106                                                   107 
107         memcpy(x, state, 64);                     108         memcpy(x, state, 64);
108                                                   109 
109         chacha_permute(x, nrounds);               110         chacha_permute(x, nrounds);
110                                                   111 
111         memcpy(&stream[0], &x[0], 16);            112         memcpy(&stream[0], &x[0], 16);
112         memcpy(&stream[4], &x[12], 16);           113         memcpy(&stream[4], &x[12], 16);
113 }                                                 114 }
114 EXPORT_SYMBOL(hchacha_block_generic);             115 EXPORT_SYMBOL(hchacha_block_generic);
115                                                   116 

~ [ source navigation ] ~ [ diff markup ] ~ [ identifier search ] ~

kernel.org | git.kernel.org | LWN.net | Project Home | SVN repository | Mail admin

Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.

sflogo.php