Skip to content

Commit a9bf879

Browse files
jedisct1jedisct1
committed
Rename state_decrypt_detached_update and state_decrypt_detached_final
1 parent cd9ffdc commit a9bf879

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+597
-597
lines changed

‎src/aegis128l/aegis128l.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,21 +122,21 @@ aegis128l_state_encrypt_final(aegis128l_state *st_, uint8_t *mac, size_t maclen)
122122
}
123123

124124
int
125-
aegis128l_state_decrypt_detached_update(aegis128l_state *st_, uint8_t *m, size_t mlen_max,
126-
size_t *written, const uint8_t *c, size_t clen)
125+
aegis128l_state_decrypt_update(aegis128l_state *st_, uint8_t *m, size_t mlen_max, size_t *written,
126+
const uint8_t *c, size_t clen)
127127
{
128-
return implementation->state_decrypt_detached_update(st_, m, mlen_max, written, c, clen);
128+
return implementation->state_decrypt_update(st_, m, mlen_max, written, c, clen);
129129
}
130130

131131
int
132-
aegis128l_state_decrypt_detached_final(aegis128l_state *st_, uint8_t *m, size_t mlen_max,
133-
size_t *written, const uint8_t *mac, size_t maclen)
132+
aegis128l_state_decrypt_final(aegis128l_state *st_, uint8_t *m, size_t mlen_max, size_t *written,
133+
const uint8_t *mac, size_t maclen)
134134
{
135135
if (maclen != 16 && maclen != 32) {
136136
errno = EINVAL;
137137
return -1;
138138
}
139-
return implementation->state_decrypt_detached_final(st_, m, mlen_max, written, mac, maclen);
139+
return implementation->state_decrypt_final(st_, m, mlen_max, written, mac, maclen);
140140
}
141141

142142
void

‎src/aegis128l/aegis128l_aesni.c‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -49,21 +49,21 @@ aegis128l_update(aes_block_t *const state, const aes_block_t d1, const aes_block
4949
# include "aegis128l_common.h"
5050

5151
struct aegis128l_implementation aegis128l_aesni_implementation = {
52-
.encrypt_detached = encrypt_detached,
53-
.decrypt_detached = decrypt_detached,
54-
.encrypt_unauthenticated = encrypt_unauthenticated,
55-
.decrypt_unauthenticated = decrypt_unauthenticated,
56-
.stream = stream,
57-
.state_init = state_init,
58-
.state_encrypt_update = state_encrypt_update,
59-
.state_encrypt_final = state_encrypt_final,
60-
.state_decrypt_detached_update = state_decrypt_detached_update,
61-
.state_decrypt_detached_final = state_decrypt_detached_final,
62-
.state_mac_init = state_mac_init,
63-
.state_mac_update = state_mac_update,
64-
.state_mac_final = state_mac_final,
65-
.state_mac_reset = state_mac_reset,
66-
.state_mac_clone = state_mac_clone,
52+
.encrypt_detached = encrypt_detached,
53+
.decrypt_detached = decrypt_detached,
54+
.encrypt_unauthenticated = encrypt_unauthenticated,
55+
.decrypt_unauthenticated = decrypt_unauthenticated,
56+
.stream = stream,
57+
.state_init = state_init,
58+
.state_encrypt_update = state_encrypt_update,
59+
.state_encrypt_final = state_encrypt_final,
60+
.state_decrypt_update = state_decrypt_update,
61+
.state_decrypt_final = state_decrypt_final,
62+
.state_mac_init = state_mac_init,
63+
.state_mac_update = state_mac_update,
64+
.state_mac_final = state_mac_final,
65+
.state_mac_reset = state_mac_reset,
66+
.state_mac_clone = state_mac_clone,
6767
};
6868

6969
# ifdef __clang__

‎src/aegis128l/aegis128l_altivec.c‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -46,21 +46,21 @@ aegis128l_update(aes_block_t *const state, const aes_block_t d1, const aes_block
4646
# include "aegis128l_common.h"
4747

4848
struct aegis128l_implementation aegis128l_altivec_implementation = {
49-
.encrypt_detached = encrypt_detached,
50-
.decrypt_detached = decrypt_detached,
51-
.encrypt_unauthenticated = encrypt_unauthenticated,
52-
.decrypt_unauthenticated = decrypt_unauthenticated,
53-
.stream = stream,
54-
.state_init = state_init,
55-
.state_encrypt_update = state_encrypt_update,
56-
.state_encrypt_final = state_encrypt_final,
57-
.state_decrypt_detached_update = state_decrypt_detached_update,
58-
.state_decrypt_detached_final = state_decrypt_detached_final,
59-
.state_mac_init = state_mac_init,
60-
.state_mac_update = state_mac_update,
61-
.state_mac_final = state_mac_final,
62-
.state_mac_reset = state_mac_reset,
63-
.state_mac_clone = state_mac_clone,
49+
.encrypt_detached = encrypt_detached,
50+
.decrypt_detached = decrypt_detached,
51+
.encrypt_unauthenticated = encrypt_unauthenticated,
52+
.decrypt_unauthenticated = decrypt_unauthenticated,
53+
.stream = stream,
54+
.state_init = state_init,
55+
.state_encrypt_update = state_encrypt_update,
56+
.state_encrypt_final = state_encrypt_final,
57+
.state_decrypt_update = state_decrypt_update,
58+
.state_decrypt_final = state_decrypt_final,
59+
.state_mac_init = state_mac_init,
60+
.state_mac_update = state_mac_update,
61+
.state_mac_final = state_mac_final,
62+
.state_mac_reset = state_mac_reset,
63+
.state_mac_clone = state_mac_clone,
6464
};
6565

6666
# ifdef __clang__

‎src/aegis128l/aegis128l_common.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -457,8 +457,8 @@ state_encrypt_final(aegis128l_state *st_, uint8_t *mac, size_t maclen)
457457
}
458458

459459
static int
460-
state_decrypt_detached_update(aegis128l_state *st_, uint8_t *m, size_t mlen_max, size_t *written,
461-
const uint8_t *c, size_t clen)
460+
state_decrypt_update(aegis128l_state *st_, uint8_t *m, size_t mlen_max, size_t *written,
461+
const uint8_t *c, size_t clen)
462462
{
463463
aegis_blocks blocks;
464464
_aegis128l_state *const st =
@@ -549,8 +549,8 @@ state_decrypt_detached_update(aegis128l_state *st_, uint8_t *m, size_t mlen_max,
549549
}
550550

551551
static int
552-
state_decrypt_detached_final(aegis128l_state *st_, uint8_t *m, size_t mlen_max, size_t *written,
553-
const uint8_t *mac, size_t maclen)
552+
state_decrypt_final(aegis128l_state *st_, uint8_t *m, size_t mlen_max, size_t *written,
553+
const uint8_t *mac, size_t maclen)
554554
{
555555
aegis_blocks blocks;
556556
CRYPTO_ALIGN(16) uint8_t computed_mac[32];

‎src/aegis128l/aegis128l_neon_aes.c‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -53,21 +53,21 @@ aegis128l_update(aes_block_t *const state, const aes_block_t d1, const aes_block
5353
# include "aegis128l_common.h"
5454

5555
struct aegis128l_implementation aegis128l_neon_aes_implementation = {
56-
.encrypt_detached = encrypt_detached,
57-
.decrypt_detached = decrypt_detached,
58-
.encrypt_unauthenticated = encrypt_unauthenticated,
59-
.decrypt_unauthenticated = decrypt_unauthenticated,
60-
.stream = stream,
61-
.state_init = state_init,
62-
.state_encrypt_update = state_encrypt_update,
63-
.state_encrypt_final = state_encrypt_final,
64-
.state_decrypt_detached_update = state_decrypt_detached_update,
65-
.state_decrypt_detached_final = state_decrypt_detached_final,
66-
.state_mac_init = state_mac_init,
67-
.state_mac_update = state_mac_update,
68-
.state_mac_final = state_mac_final,
69-
.state_mac_reset = state_mac_reset,
70-
.state_mac_clone = state_mac_clone,
56+
.encrypt_detached = encrypt_detached,
57+
.decrypt_detached = decrypt_detached,
58+
.encrypt_unauthenticated = encrypt_unauthenticated,
59+
.decrypt_unauthenticated = decrypt_unauthenticated,
60+
.stream = stream,
61+
.state_init = state_init,
62+
.state_encrypt_update = state_encrypt_update,
63+
.state_encrypt_final = state_encrypt_final,
64+
.state_decrypt_update = state_decrypt_update,
65+
.state_decrypt_final = state_decrypt_final,
66+
.state_mac_init = state_mac_init,
67+
.state_mac_update = state_mac_update,
68+
.state_mac_final = state_mac_final,
69+
.state_mac_reset = state_mac_reset,
70+
.state_mac_clone = state_mac_clone,
7171
};
7272

7373
# ifdef __clang__

‎src/aegis128l/aegis128l_neon_sha3.c‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -58,21 +58,21 @@ aegis128l_update(aes_block_t *const state, const aes_block_t d1, const aes_block
5858
# include "aegis128l_common.h"
5959

6060
struct aegis128l_implementation aegis128l_neon_sha3_implementation = {
61-
.encrypt_detached = encrypt_detached,
62-
.decrypt_detached = decrypt_detached,
63-
.encrypt_unauthenticated = encrypt_unauthenticated,
64-
.decrypt_unauthenticated = decrypt_unauthenticated,
65-
.stream = stream,
66-
.state_init = state_init,
67-
.state_encrypt_update = state_encrypt_update,
68-
.state_encrypt_final = state_encrypt_final,
69-
.state_decrypt_detached_update = state_decrypt_detached_update,
70-
.state_decrypt_detached_final = state_decrypt_detached_final,
71-
.state_mac_init = state_mac_init,
72-
.state_mac_update = state_mac_update,
73-
.state_mac_final = state_mac_final,
74-
.state_mac_reset = state_mac_reset,
75-
.state_mac_clone = state_mac_clone,
61+
.encrypt_detached = encrypt_detached,
62+
.decrypt_detached = decrypt_detached,
63+
.encrypt_unauthenticated = encrypt_unauthenticated,
64+
.decrypt_unauthenticated = decrypt_unauthenticated,
65+
.stream = stream,
66+
.state_init = state_init,
67+
.state_encrypt_update = state_encrypt_update,
68+
.state_encrypt_final = state_encrypt_final,
69+
.state_decrypt_update = state_decrypt_update,
70+
.state_decrypt_final = state_decrypt_final,
71+
.state_mac_init = state_mac_init,
72+
.state_mac_update = state_mac_update,
73+
.state_mac_final = state_mac_final,
74+
.state_mac_reset = state_mac_reset,
75+
.state_mac_clone = state_mac_clone,
7676
};
7777

7878
# ifdef __clang__

‎src/aegis128l/aegis128l_soft.c‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -43,21 +43,21 @@ aegis128l_update(aes_block_t *const state, const aes_block_t d1, const aes_block
4343
# include "aegis128l_common.h"
4444

4545
struct aegis128l_implementation aegis128l_soft_implementation = {
46-
.encrypt_detached = encrypt_detached,
47-
.decrypt_detached = decrypt_detached,
48-
.encrypt_unauthenticated = encrypt_unauthenticated,
49-
.decrypt_unauthenticated = decrypt_unauthenticated,
50-
.stream = stream,
51-
.state_init = state_init,
52-
.state_encrypt_update = state_encrypt_update,
53-
.state_encrypt_final = state_encrypt_final,
54-
.state_decrypt_detached_update = state_decrypt_detached_update,
55-
.state_decrypt_detached_final = state_decrypt_detached_final,
56-
.state_mac_init = state_mac_init,
57-
.state_mac_update = state_mac_update,
58-
.state_mac_final = state_mac_final,
59-
.state_mac_reset = state_mac_reset,
60-
.state_mac_clone = state_mac_clone,
46+
.encrypt_detached = encrypt_detached,
47+
.decrypt_detached = decrypt_detached,
48+
.encrypt_unauthenticated = encrypt_unauthenticated,
49+
.decrypt_unauthenticated = decrypt_unauthenticated,
50+
.stream = stream,
51+
.state_init = state_init,
52+
.state_encrypt_update = state_encrypt_update,
53+
.state_encrypt_final = state_encrypt_final,
54+
.state_decrypt_update = state_decrypt_update,
55+
.state_decrypt_final = state_decrypt_final,
56+
.state_mac_init = state_mac_init,
57+
.state_mac_update = state_mac_update,
58+
.state_mac_final = state_mac_final,
59+
.state_mac_reset = state_mac_reset,
60+
.state_mac_clone = state_mac_clone,
6161
};
6262

6363
#endif

‎src/aegis128l/implementations.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ typedef struct aegis128l_implementation {
2121
const uint8_t *k);
2222
int (*state_encrypt_update)(aegis128l_state *st_, uint8_t *c, const uint8_t *m, size_t mlen);
2323
int (*state_encrypt_final)(aegis128l_state *st_, uint8_t *mac, size_t maclen);
24-
int (*state_decrypt_detached_update)(aegis128l_state *st_, uint8_t *m, size_t mlen_max,
25-
size_t *written, const uint8_t *c, size_t clen);
26-
int (*state_decrypt_detached_final)(aegis128l_state *st_, uint8_t *m, size_t mlen_max,
27-
size_t *written, const uint8_t *mac, size_t maclen);
24+
int (*state_decrypt_update)(aegis128l_state *st_, uint8_t *m, size_t mlen_max, size_t *written,
25+
const uint8_t *c, size_t clen);
26+
int (*state_decrypt_final)(aegis128l_state *st_, uint8_t *m, size_t mlen_max, size_t *written,
27+
const uint8_t *mac, size_t maclen);
2828
void (*state_mac_init)(aegis128l_mac_state *st_, const uint8_t *npub, const uint8_t *k);
2929
int (*state_mac_update)(aegis128l_mac_state *st_, const uint8_t *ad, size_t adlen);
3030
int (*state_mac_final)(aegis128l_mac_state *st_, uint8_t *mac, size_t maclen);

‎src/aegis128x2/aegis128x2.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,21 +122,21 @@ aegis128x2_state_encrypt_final(aegis128x2_state *st_, uint8_t *mac, size_t macle
122122
}
123123

124124
int
125-
aegis128x2_state_decrypt_detached_update(aegis128x2_state *st_, uint8_t *m, size_t mlen_max,
126-
size_t *written, const uint8_t *c, size_t clen)
125+
aegis128x2_state_decrypt_update(aegis128x2_state *st_, uint8_t *m, size_t mlen_max, size_t *written,
126+
const uint8_t *c, size_t clen)
127127
{
128-
return implementation->state_decrypt_detached_update(st_, m, mlen_max, written, c, clen);
128+
return implementation->state_decrypt_update(st_, m, mlen_max, written, c, clen);
129129
}
130130

131131
int
132-
aegis128x2_state_decrypt_detached_final(aegis128x2_state *st_, uint8_t *m, size_t mlen_max,
133-
size_t *written, const uint8_t *mac, size_t maclen)
132+
aegis128x2_state_decrypt_final(aegis128x2_state *st_, uint8_t *m, size_t mlen_max, size_t *written,
133+
const uint8_t *mac, size_t maclen)
134134
{
135135
if (maclen != 16 && maclen != 32) {
136136
errno = EINVAL;
137137
return -1;
138138
}
139-
return implementation->state_decrypt_detached_final(st_, m, mlen_max, written, mac, maclen);
139+
return implementation->state_decrypt_final(st_, m, mlen_max, written, mac, maclen);
140140
}
141141

142142
void

‎src/aegis128x2/aegis128x2_aesni.c‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -84,21 +84,21 @@ aegis128x2_update(aes_block_t *const state, const aes_block_t d1, const aes_bloc
8484
# include "aegis128x2_common.h"
8585

8686
struct aegis128x2_implementation aegis128x2_aesni_implementation = {
87-
.encrypt_detached = encrypt_detached,
88-
.decrypt_detached = decrypt_detached,
89-
.encrypt_unauthenticated = encrypt_unauthenticated,
90-
.decrypt_unauthenticated = decrypt_unauthenticated,
91-
.stream = stream,
92-
.state_init = state_init,
93-
.state_encrypt_update = state_encrypt_update,
94-
.state_encrypt_final = state_encrypt_final,
95-
.state_decrypt_detached_update = state_decrypt_detached_update,
96-
.state_decrypt_detached_final = state_decrypt_detached_final,
97-
.state_mac_init = state_mac_init,
98-
.state_mac_update = state_mac_update,
99-
.state_mac_final = state_mac_final,
100-
.state_mac_reset = state_mac_reset,
101-
.state_mac_clone = state_mac_clone,
87+
.encrypt_detached = encrypt_detached,
88+
.decrypt_detached = decrypt_detached,
89+
.encrypt_unauthenticated = encrypt_unauthenticated,
90+
.decrypt_unauthenticated = decrypt_unauthenticated,
91+
.stream = stream,
92+
.state_init = state_init,
93+
.state_encrypt_update = state_encrypt_update,
94+
.state_encrypt_final = state_encrypt_final,
95+
.state_decrypt_update = state_decrypt_update,
96+
.state_decrypt_final = state_decrypt_final,
97+
.state_mac_init = state_mac_init,
98+
.state_mac_update = state_mac_update,
99+
.state_mac_final = state_mac_final,
100+
.state_mac_reset = state_mac_reset,
101+
.state_mac_clone = state_mac_clone,
102102
};
103103

104104
# ifdef __clang__

0 commit comments

Comments
 (0)