cuberite/polarssl
1
0
Fork 0
mirror of https://github.com/cuberite/polarssl.git synced 2025-10-31 03:30:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

aria: improve some comments & internal names

Browse Source
This commit is contained in:
Manuel Pégourié-Gonnard 2018-02-20 13:45:44 +01:00
parent 442f03b9e1
commit a6d639e553
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/mbedtls/error.h
View File

@ -63,7 +63,7 @@
* CTR_DBRG 4 0x0034-0x003A * CTR_DBRG 4 0x0034-0x003A
* ENTROPY 3 0x003C-0x0040 0x003D-0x003F * ENTROPY 3 0x003C-0x0040 0x003D-0x003F
* NET 11 0x0042-0x0052 0x0043-0x0045 * NET 11 0x0042-0x0052 0x0043-0x0045
* ARIA 1 0x005C-0x005E * ARIA 2 0x005C-0x005E
* ASN1 7 0x0060-0x006C * ASN1 7 0x0060-0x006C
* CMAC 1 0x007A-0x007A * CMAC 1 0x007A-0x007A
* PBKDF2 1 0x007C-0x007C * PBKDF2 1 0x007C-0x007C

28
library/aria.c
View File

@ -19,6 +19,12 @@
* This file is part of mbed TLS (https://tls.mbed.org) * This file is part of mbed TLS (https://tls.mbed.org)
*/ */
/*
* This implementation is based on the following standards:
* [1] http://210.104.33.10/ARIA/doc/ARIA-specification-e.pdf
* [2] https://tools.ietf.org/html/rfc5794
*/
#if !defined(MBEDTLS_CONFIG_FILE) #if !defined(MBEDTLS_CONFIG_FILE)
#include "mbedtls/config.h" #include "mbedtls/config.h"
#else #else
@ -96,10 +102,14 @@
} }
// ARIA Round function ( Substitution Layer SLx + Affine Transform A ) /* ARIA Round function ( Substitution Layer SLx + Affine Transform A )
// (ra, rb, rc, rd) = state in/out * (ra, rb, rc, rd) = state in/out
// (sa, sb, sc, sd) = 256 8-bit S-Boxes * (sa, sb, sc, sd) = 256 8-bit S-Boxes (see below)
// (ta, tb, tc) = temporary variables * (ta, tb, tc) = temporary variables
*
* By passing sb1, sb2, is1, is2 as S-Boxes you get SL1-then-A.
* By passing is1, is2, sb1, sb2 as S-Boxes you get SL2-then-A.
*/
#define ARIA_SLA( ra, rb, rc, rd, sa, sb, sc, sd, ta, tb, tc ) { \ #define ARIA_SLA( ra, rb, rc, rd, sa, sb, sc, sd, ta, tb, tc ) { \
ta = ( (uint32_t) sc[(rb >> 16) & 0xFF]) ^ \ ta = ( (uint32_t) sc[(rb >> 16) & 0xFF]) ^ \
@ -243,7 +253,7 @@ static const uint8_t aria_is2[0x100] =
// r = FO( p, k ) ^ x // r = FO( p, k ) ^ x
static void aria_fo( uint32_t r[4], static void aria_fo_xor( uint32_t r[4],
const uint32_t p[4], const uint32_t k[4], const uint32_t x[4] ) const uint32_t p[4], const uint32_t k[4], const uint32_t x[4] )
{ {
uint32_t a, b, c, d; uint32_t a, b, c, d;
@ -264,7 +274,7 @@ static void aria_fo( uint32_t r[4],
// r = FE( p, k ) ^ x // r = FE( p, k ) ^ x
static void aria_fe(uint32_t r[4], static void aria_fe_xor(uint32_t r[4],
const uint32_t p[4], const uint32_t k[4], const uint32_t x[4] ) const uint32_t p[4], const uint32_t k[4], const uint32_t x[4] )
{ {
uint32_t a, b, c, d; uint32_t a, b, c, d;
@ -350,11 +360,11 @@ int mbedtls_aria_setkey_enc(mbedtls_aria_context *ctx,
i = (keybits - 128) >> 6; // index: 0, 1, 2 i = (keybits - 128) >> 6; // index: 0, 1, 2
ctx->nr = 12 + 2 * i; // no. rounds: 12, 14, 16 ctx->nr = 12 + 2 * i; // no. rounds: 12, 14, 16
aria_fo( w[1], w[0], rc[i], w[1] ); // W1 = FO(W0, CK1) ^ KR aria_fo_xor( w[1], w[0], rc[i], w[1] ); // W1 = FO(W0, CK1) ^ KR
i = i < 2 ? i + 1 : 0; i = i < 2 ? i + 1 : 0;
aria_fe( w[2], w[1], rc[i], w[0] ); // W2 = FE(W1, CK2) ^ W0 aria_fe_xor( w[2], w[1], rc[i], w[0] ); // W2 = FE(W1, CK2) ^ W0
i = i < 2 ? i + 1 : 0; i = i < 2 ? i + 1 : 0;
aria_fo( w[3], w[2], rc[i], w[1] ); // W3 = FO(W2, CK3) ^ W1 aria_fo_xor( w[3], w[2], rc[i], w[1] ); // W3 = FO(W2, CK3) ^ W1
for( i = 0; i < 4; i++ ) // create round keys for( i = 0; i < 4; i++ ) // create round keys
{ {