Skip to content

Fixed compiler issues, fixed several algorithms, 64-bit machine fix, add Makefile to build and run all tests, rollup of all previous (to #15) pull requests #15

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
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Fixed compiler issues, fixed several algorithms, 64-bit machine fix, add Makefile to build and run all tests, rollup of all previous (to #15) pull requests #15

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1d975f5
Add Makefile and fix all c99 warnings
lcn2 May 18, 2017
8278309
Document make clobber all and make test
lcn2 May 18, 2017
a9a6897
Fixes to allow for inclusion of multiple headers
lcn2 May 30, 2017
d576d1c
Fixed AES code for some compilers
lcn2 May 30, 2017
f8456ab
Fixed incorrect variable initializtion
lcn2 May 30, 2017
0ac9517
Complete AES compiler fix
lcn2 May 30, 2017
49047cb
Added single sha256() hash function
lcn2 May 30, 2017
a5e7476
Fixed RC4 to preserve state across calls
lcn2 May 31, 2017
ef5ea55
Improved test PASS / FAIL notification
lcn2 May 31, 2017
df7c024
Improve make clean and make clobber
lcn2 May 31, 2017
01bc06c
Add single function hash for MD2, MD5, SHA1
lcn2 Jun 1, 2017
9a32f8f
Fix base64 test bug
lcn2 Jun 1, 2017
fa3a10d
Fixed rot-13 for non-ASCII
lcn2 Jun 1, 2017
3542eaf
Improve C code formtting
lcn2 Sep 23, 2017
7085469
Declare Speck128/128 block size in bytes
lcn2 Sep 23, 2017
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
Prev Previous commit
Next Next commit
Fixed AES code for some compilers 
Fixed how 3DES triggers encrypt and decrypt.

Fixed header guard symbol.
  • Loading branch information
@lcn2
lcn2 committed May 30, 2017
commit d576d1c20793f6f7dad7dbb379df549e703c5d78
10 changes: 5 additions & 5 deletions des.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,14 +250,14 @@ void des_crypt(const BYTE in[], BYTE out[], const BYTE key[][6])
void three_des_key_setup(const BYTE key[], BYTE schedule[][16][6], DES_MODE mode)
{
if (mode == DES_ENCRYPT) {
des_key_setup(&key[0],schedule[0],mode);
des_key_setup(&key[0],schedule[0], DES_ENCRYPT);
des_key_setup(&key[8],schedule[1],!mode);
des_key_setup(&key[16],schedule[2],mode);
des_key_setup(&key[16],schedule[2], DES_ENCRYPT);
}
else /*if (mode == DES_DECRYPT*/ {
des_key_setup(&key[16],schedule[0],mode);
des_key_setup(&key[8],schedule[1],!mode);
des_key_setup(&key[0],schedule[2],mode);
des_key_setup(&key[16],schedule[0], DES_DECRYPT);
des_key_setup(&key[8],schedule[1], DES_ENCRYPT);
des_key_setup(&key[0],schedule[2], DES_DECRYPT);
}
}

Expand Down
2 changes: 1 addition & 1 deletion des.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*********************************************************************/

#ifndef DES_H
#define DESH
#define DES_H

/*************************** HEADER FILES ***************************/
#include <stddef.h>
Expand Down