sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-29 02:50:28 +03:00
Code

lib: crypt: Prepare the existing code to switch to Intel AES hardware instructions.

Browse Source 
Rename the old struct aes_key as an intermediate struct aes_key_rj
and wrap it in a union so we can chose an alternate aes_key struct
when using Intel AES hardware.

Rename the original software implementations of:

 AES_set_encrypt_key()
 AES_set_decrypt_key()
 AES_encrypt()
 AES_decrypt()

by adding an _rj on the end, and call them via a wrapper
function.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13008

Based on original work by Justin Maggard <jmaggard@netgear.com>

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Jeremy Allison 2017-08-31 11:41:32 -07:00
parent 11a5676895
commit 3324b55bde
2 changed files with 67 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
lib/crypto/aes.c
View File

@ -37,35 +37,85 @@
#ifdef SAMBA_RIJNDAEL
#include "rijndael-alg-fst.h"
/*
* The next 4 functions are the pure software implementations
* of:
*
* AES_set_encrypt_key()
* AES_set_decrypt_key()
* AES_encrypt()
* AES_decrypt()
*/
static int
AES_set_encrypt_key_rj(const unsigned char *userkey, const int bits, AES_KEY *key)
{
key->u.aes_rj.rounds = rijndaelKeySetupEnc(key->u.aes_rj.key, userkey, bits);
if (key->u.aes_rj.rounds == 0)
return -1;
return 0;
}
static int
AES_set_decrypt_key_rj(const unsigned char *userkey, const int bits, AES_KEY *key)
{
key->u.aes_rj.rounds = rijndaelKeySetupDec(key->u.aes_rj.key, userkey, bits);
if (key->u.aes_rj.rounds == 0)
return -1;
return 0;
}
static void
AES_encrypt_rj(const unsigned char *in, unsigned char *out, const AES_KEY *key)
{
rijndaelEncrypt(key->u.aes_rj.key, key->u.aes_rj.rounds, in, out);
}
static void
AES_decrypt_rj(const unsigned char *in, unsigned char *out, const AES_KEY *key)
{
rijndaelDecrypt(key->u.aes_rj.key, key->u.aes_rj.rounds, in, out);
}
/*
* The next 4 functions are the runtime switch for Intel AES hardware
* implementations of:
*
* AES_set_encrypt_key()
* AES_set_decrypt_key()
* AES_encrypt()
* AES_decrypt()
*
* If the hardware instructions don't exist, fall back to the software
* versions.
*
* Currently only use the software implementations.
*/
int
AES_set_encrypt_key(const unsigned char *userkey, const int bits, AES_KEY *key)
{
key->rounds = rijndaelKeySetupEnc(key->key, userkey, bits);
if (key->rounds == 0)
return -1;
return 0;
return AES_set_encrypt_key_rj(userkey, bits, key);
}
int
AES_set_decrypt_key(const unsigned char *userkey, const int bits, AES_KEY *key)
{
key->rounds = rijndaelKeySetupDec(key->key, userkey, bits);
if (key->rounds == 0)
return -1;
return 0;
return AES_set_decrypt_key_rj(userkey, bits, key);
}
void
AES_encrypt(const unsigned char *in, unsigned char *out, const AES_KEY *key)
{
rijndaelEncrypt(key->key, key->rounds, in, out);
return AES_encrypt_rj(in, out, key);
}
void
AES_decrypt(const unsigned char *in, unsigned char *out, const AES_KEY *key)
{
rijndaelDecrypt(key->key, key->rounds, in, out);
return AES_decrypt_rj(in, out, key);
}
#endif /* SAMBA_RIJNDAEL */
#ifdef SAMBA_AES_CBC_ENCRYPT

8
lib/crypto/aes.h
View File

@ -59,9 +59,15 @@
#define AES_ENCRYPT 1
#define AES_DECRYPT 0
typedef struct aes_key {
struct aes_key_rj {
uint32_t key[(AES_MAXNR+1)*4];
int rounds;
};
typedef struct aes_key {
union {
struct aes_key_rj aes_rj;
} u;
} AES_KEY;
#ifdef __cplusplus