eclipse/tinydtls
1
0
Fork 0
mirror of https://github.com/eclipse/tinydtls.git synced 2025-05-08 11:27:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Separate out rijndael.c into primary and wrapper functions

Browse Source 
Some platforms already provide the primary rijndael functions, but do not
have the specific TinyDTLS wrapper functions.

This change is to split out the primary (i.e. common) rijndael functions
(leave in rijndael.c) and the TinyDTLS wrapper functions (put into
rijndael_wrap.c) and removing the appropriate #ifdef DTLS_EXT_RIJNDAEL.

.gitignore:

Ignore .so library file

Makefile.in:
Makefile.tinydtls:
aes/Makefile.in:
aes/Makefile.riot:

Add in rijndael_wrap.[co] as appropriate.

aes/rijndael.c:

Remove the wrapper functions.
Make rijndaelDecrypt() non static.

aes/rijndael.h:

Add in rijndaelDecrypt() definition if WITH_AES_DECRYPT

aes/rijndael_wrap.c: (New)

Add in the wrapper functions.

Signed-off-by: Jon Shallow <supjps-libcoap@jpshallow.com>
This commit is contained in:
Jon Shallow 2019-04-23 13:42:58 +01:00
parent 7f8c86e501
commit 35cdb3d356
8 changed files with 78 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -14,6 +14,7 @@ doc/Doxyfile
doc/doxygen.out
doc/html/
libtinydtls.a
libtinydtls.so
tests/ccm-test
tests/dtls-client
tests/dtls-server

2
Makefile.in
View File

@ -39,7 +39,7 @@ install := cp
# files and flags
SOURCES:= dtls.c crypto.c ccm.c hmac.c netq.c peer.c dtls_time.c session.c dtls_debug.c dtls_prng.c
SUB_OBJECTS:=aes/rijndael.o @OPT_OBJS@
SUB_OBJECTS:=aes/rijndael.o aes/rijndael_wrap.o @OPT_OBJS@
OBJECTS:= $(patsubst %.c, %.o, $(SOURCES)) $(SUB_OBJECTS)
HEADERS:=dtls.h hmac.h dtls_debug.h dtls_config.h uthash.h numeric.h crypto.h global.h ccm.h \
netq.h alert.h utlist.h dtls_prng.h peer.h state.h dtls_time.h session.h \

2
Makefile.tinydtls
View File

@ -1,7 +1,7 @@
# This is a -*- Makefile -*-
CFLAGS += -DDTLSv12 -DWITH_SHA256
tinydtls_src = dtls.c crypto.c hmac.c rijndael.c sha2.c ccm.c netq.c ecc.c dtls_time.c peer.c session.c dtls_prng.c
tinydtls_src = dtls.c crypto.c hmac.c rijndael.c rijndael_wrap.c sha2.c ccm.c netq.c ecc.c dtls_time.c peer.c session.c dtls_prng.c
# This activates debugging support
# CFLAGS += -DNDEBUG

2
aes/Makefile.in
View File

@ -26,7 +26,7 @@ abs_builddir = @abs_builddir@
top_builddir = @top_builddir@
top_srcdir:= @top_srcdir@
SOURCES:= rijndael.c
SOURCES:= rijndael.c rijndael_wrap.c
HEADERS:= rijndael.h
OBJECTS:= $(patsubst %.c, %.o, $(SOURCES))
CPPFLAGS=@CPPFLAGS@

2
aes/Makefile.riot
View File

@ -1,5 +1,5 @@
MODULE := tinydtls_aes
SRC := rijndael.c
SRC := rijndael.c rijndael_wrap.c
include $(RIOTBASE)/Makefile.base

55
aes/rijndael.c
View File

@ -722,7 +722,6 @@ static const aes_u32 rcon[] = {
#define GETU32(pt) (((aes_u32)(pt)[0] << 24) ^ ((aes_u32)(pt)[1] << 16) ^ ((aes_u32)(pt)[2] << 8) ^ ((aes_u32)(pt)[3]))
#define PUTU32(ct, st) { (ct)[0] = (aes_u8)((st) >> 24); (ct)[1] = (aes_u8)((st) >> 16); (ct)[2] = (aes_u8)((st) >> 8); (ct)[3] = (aes_u8)(st); }
#ifndef DTLS_EXT_RIJNDAEL
/**
* Expand the cipher key into the encryption key schedule.
*
@ -809,7 +808,6 @@ rijndaelKeySetupEnc(aes_u32 rk[/*4*(Nr + 1)*/], const aes_u8 cipherKey[], int ke
}
return 0;
}
#endif /* ! DTLS_EXT_RIJNDAEL */
#ifdef WITH_AES_DECRYPT
/**
@ -861,7 +859,6 @@ rijndaelKeySetupDec(aes_u32 rk[/*4*(Nr + 1)*/], const aes_u8 cipherKey[], int ke
}
#endif
#ifndef DTLS_EXT_RIJNDAEL
void
rijndaelEncrypt(const aes_u32 rk[/*4*(Nr + 1)*/], int Nr, const aes_u8 pt[16],
aes_u8 ct[16])
@ -1047,7 +1044,7 @@ rijndaelEncrypt(const aes_u32 rk[/*4*(Nr + 1)*/], int Nr, const aes_u8 pt[16],
}
#ifdef WITH_AES_DECRYPT
static void
void
rijndaelDecrypt(const aes_u32 rk[/*4*(Nr + 1)*/], int Nr, const aes_u8 ct[16],
aes_u8 pt[16])
{
@ -1231,54 +1228,4 @@ rijndaelDecrypt(const aes_u32 rk[/*4*(Nr + 1)*/], int Nr, const aes_u8 ct[16],
PUTU32(pt + 12, s3);
}
#endif /* WITH_AES_DECRYPT */
#endif /* ! DTLS_EXT_RIJNDAEL */
/* setup key context for encryption only */
int
rijndael_set_key_enc_only(rijndael_ctx *ctx, const u_char *key, int bits)
{
int rounds;
rounds = rijndaelKeySetupEnc(ctx->ek, key, bits);
if (rounds == 0)
return -1;
ctx->Nr = rounds;
#ifdef WITH_AES_DECRYPT
ctx->enc_only = 1;
#endif
return 0;
}
#ifdef WITH_AES_DECRYPT
/* setup key context for both encryption and decryption */
int
rijndael_set_key(rijndael_ctx *ctx, const u_char *key, int bits)
{
int rounds;
rounds = rijndaelKeySetupEnc(ctx->ek, key, bits);
if (rounds == 0)
return -1;
if (rijndaelKeySetupDec(ctx->dk, key, bits) != rounds)
return -1;
ctx->Nr = rounds;
ctx->enc_only = 0;
return 0;
}
void
rijndael_decrypt(rijndael_ctx *ctx, const u_char *src, u_char *dst)
{
rijndaelDecrypt(ctx->dk, ctx->Nr, src, dst);
}
#endif
void
rijndael_encrypt(rijndael_ctx *ctx, const u_char *src, u_char *dst)
{
rijndaelEncrypt(ctx->ek, ctx->Nr, src, dst);
}

3
aes/rijndael.h
View File

@ -62,5 +62,8 @@ void rijndael_encrypt(rijndael_ctx *, const u_char *, u_char *);
int rijndaelKeySetupEnc(aes_u32 rk[/*4*(Nr + 1)*/], const aes_u8 cipherKey[], int keyBits);
int rijndaelKeySetupDec(aes_u32 rk[/*4*(Nr + 1)*/], const aes_u8 cipherKey[], int keyBits);
void rijndaelEncrypt(const aes_u32 rk[/*4*(Nr + 1)*/], int Nr, const aes_u8 pt[16], aes_u8 ct[16]);
#ifdef WITH_AES_DECRYPT
void rijndaelDecrypt(const aes_u32 rk[/*4*(Nr + 1)*/], int Nr, const aes_u8 ct[16], aes_u8 pt[16]);
#endif
#endif /* __RIJNDAEL_H */

69
aes/rijndael_wrap.c Normal file
View File

@ -0,0 +1,69 @@
/*******************************************************************************
*
* Copyright (c) 2019 Olaf Bergmann (TZI) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* and Eclipse Distribution License v. 1.0 which accompanies this distribution.
*
* The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
* and the Eclipse Distribution License is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
*
* Contributors:
* Olaf Bergmann - initial API and implementation
* Jon Shallow - split out wrapper code to support external rijndael code
*
*
*******************************************************************************/
#include "rijndael.h"
/* setup key context for encryption only */
int
rijndael_set_key_enc_only(rijndael_ctx *ctx, const u_char *key, int bits)
{
int rounds;
rounds = rijndaelKeySetupEnc(ctx->ek, key, bits);
if (rounds == 0)
return -1;
ctx->Nr = rounds;
#ifdef WITH_AES_DECRYPT
ctx->enc_only = 1;
#endif
return 0;
}
#ifdef WITH_AES_DECRYPT
/* setup key context for both encryption and decryption */
int
rijndael_set_key(rijndael_ctx *ctx, const u_char *key, int bits)
{
int rounds;
rounds = rijndaelKeySetupEnc(ctx->ek, key, bits);
if (rounds == 0)
return -1;
if (rijndaelKeySetupDec(ctx->dk, key, bits) != rounds)
return -1;
ctx->Nr = rounds;
ctx->enc_only = 0;
return 0;
}
void
rijndael_decrypt(rijndael_ctx *ctx, const u_char *src, u_char *dst)
{
rijndaelDecrypt(ctx->dk, ctx->Nr, src, dst);
}
#endif
void
rijndael_encrypt(rijndael_ctx *ctx, const u_char *src, u_char *dst)
{
rijndaelEncrypt(ctx->ek, ctx->Nr, src, dst);
}