Skip to content

aes: add AES-128-XTS and AES-256-XTS #506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MarkAtwood wants to merge 1 commit into
base: master
Choose a base branch
from
Open

aes: add AES-128-XTS and AES-256-XTS #506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions IDE/WINVS/wolfprovider/wolfprovider.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
<ClCompile Include="..\..\..\src\wp_aes_stream.c" />
<ClCompile Include="..\..\..\src\wp_aes_aead.c" />
<ClCompile Include="..\..\..\src\wp_aes_wrap.c" />
<ClCompile Include="..\..\..\src\wp_aes_xts.c" />
<ClCompile Include="..\..\..\src\wp_des.c" />
<ClCompile Include="..\..\..\src\wp_hmac.c" />
<ClCompile Include="..\..\..\src\wp_cmac.c" />
Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ Information on how to configure, build, and test wolfProvider can be found here:
### Symmetric Ciphers
* AES (128, 192, 256-bit keys)
* ECB, CBC, CTR, CFB, CTS
* XTS (AES-128-XTS, AES-256-XTS)
* GCM, CCM (AEAD)
* Key Wrap
* 3DES-CBC
Expand Down
6 changes: 6 additions & 0 deletions include/wolfprovider/alg_funcs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,9 @@ typedef void (*DFUNC)(void);
#define WP_NAMES_AES_192_CTS "AES-192-CBC-CTS"
#define WP_NAMES_AES_128_CTS "AES-128-CBC-CTS"

#define WP_NAMES_AES_256_XTS "AES-256-XTS:1.3.111.2.1619.0.1.2"
#define WP_NAMES_AES_128_XTS "AES-128-XTS:1.3.111.2.1619.0.1.1"

#define WP_NAMES_DES_EDE3_CBC "DES-EDE3-CBC:DES3:1.2.840.113549.3.7"

/* Internal cipher flags. */
Expand Down Expand Up @@ -431,6 +434,9 @@ extern const OSSL_DISPATCH wp_aes256cts_functions[];
extern const OSSL_DISPATCH wp_aes192cts_functions[];
extern const OSSL_DISPATCH wp_aes128cts_functions[];

extern const OSSL_DISPATCH wp_aes256xts_functions[];
extern const OSSL_DISPATCH wp_aes128xts_functions[];

extern const OSSL_DISPATCH wp_des3cbc_functions[];

/* MAC implementations. */
Expand Down
4 changes: 4 additions & 0 deletions include/wolfprovider/settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,10 @@
#ifdef WOLFSSL_AES_CFB
#define WP_HAVE_AESCFB
#endif
/* wc_AesXtsSetKeyNoInit() is available from wolfSSL 5.6.6. */
#if defined(WOLFSSL_AES_XTS) && (LIBWOLFSSL_VERSION_HEX >= 0x05006006)
#define WP_HAVE_AESXTS
#endif

#ifndef WC_NO_RNG
#define WP_HAVE_RANDOM
Expand Down
1 change: 1 addition & 0 deletions src/include.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ libwolfprov_la_SOURCES += src/wp_aes_block.c
libwolfprov_la_SOURCES += src/wp_aes_stream.c
libwolfprov_la_SOURCES += src/wp_aes_aead.c
libwolfprov_la_SOURCES += src/wp_aes_wrap.c
libwolfprov_la_SOURCES += src/wp_aes_xts.c
libwolfprov_la_SOURCES += src/wp_des.c
libwolfprov_la_SOURCES += src/wp_hmac.c
libwolfprov_la_SOURCES += src/wp_cmac.c
Expand Down
Loading
Loading