diff options
| author | Damien Miller <djm@mindrot.org> | 2014-05-15 05:45:26 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2014-05-15 05:45:26 +0200 |
| commit | ec0b67eb3b4e12f296ced1fafa01860c374f7eea (patch) | |
| tree | 5514466b059c42ca2fe51e9a0801614465c447aa /rijndael.h | |
| parent | - (dtucker) [defines.h] Define __GNUC_PREREQ__ macro if we don't already (diff) | |
| download | openssh-ec0b67eb3b4e12f296ced1fafa01860c374f7eea.tar.xz openssh-ec0b67eb3b4e12f296ced1fafa01860c374f7eea.zip | |
- (djm) [rijndael.c rijndael.h] Sync with newly-ressurected versions ine
OpenBSD
Diffstat (limited to 'rijndael.h')
| -rw-r--r-- | rijndael.h | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/rijndael.h b/rijndael.h index c614bb188..53e74e0a8 100644 --- a/rijndael.h +++ b/rijndael.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rijndael.h,v 1.12 2001/12/19 07:18:56 deraadt Exp $ */ +/* $OpenBSD: rijndael.h,v 1.14 2014/04/29 15:42:07 markus Exp $ */ /** * rijndael-alg-fst.h @@ -25,27 +25,32 @@ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __RIJNDAEL_H -#define __RIJNDAEL_H +#ifndef _PRIVATE_RIJNDAEL_H +#define _PRIVATE_RIJNDAEL_H -#define MAXKC (256/32) -#define MAXKB (256/8) -#define MAXNR 14 +#define AES_MAXKEYBITS (256) +#define AES_MAXKEYBYTES (AES_MAXKEYBITS/8) +/* for 256-bit keys, fewer for less */ +#define AES_MAXROUNDS 14 typedef unsigned char u8; typedef unsigned short u16; typedef unsigned int u32; +int rijndaelKeySetupEnc(unsigned int [], const unsigned char [], int); +void rijndaelEncrypt(const unsigned int [], int, const unsigned char [], + unsigned char []); + /* The structure for key information */ typedef struct { int decrypt; - int Nr; /* key-length-dependent number of rounds */ - u32 ek[4*(MAXNR + 1)]; /* encrypt key schedule */ - u32 dk[4*(MAXNR + 1)]; /* decrypt key schedule */ + int Nr; /* key-length-dependent number of rounds */ + u32 ek[4*(AES_MAXROUNDS + 1)]; /* encrypt key schedule */ + u32 dk[4*(AES_MAXROUNDS + 1)]; /* decrypt key schedule */ } rijndael_ctx; void rijndael_set_key(rijndael_ctx *, u_char *, int, int); void rijndael_decrypt(rijndael_ctx *, u_char *, u_char *); void rijndael_encrypt(rijndael_ctx *, u_char *, u_char *); -#endif /* __RIJNDAEL_H */ +#endif /* _PRIVATE_RIJNDAEL_H */ |