Commit 97879bcd authored by Richard Levitte's avatar Richard Levitte
Browse files

Add the modes OFB128, CFB128 and CTR128 to AES. 

Submitted by Stephen Sprunk <stephen@sprunk.org>
parent ab1dee1e

crypto/aes/Makefile.ssl

+2 −2
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ TEST= 
APPS=



LIB=$(TOP)/libcrypto.a

LIBSRC=aes_core.c aes_misc.c aes_ecb.c aes_cbc.c

LIBOBJ=aes_core.o aes_misc.o aes_ecb.o aes_cbc.o

LIBSRC=aes_core.c aes_misc.c aes_ecb.c aes_cbc.c aes_cfb.c aes_ofb.c aes_ctr.c

LIBOBJ=aes_core.o aes_misc.o aes_ecb.o aes_cbc.o aes_cfb.o aes_ofb.o aes_ctr.o



SRC= $(LIBSRC)

crypto/aes/aes.h

+26 −10
Original line number Diff line number Diff line 
/* crypto/aes/aes.h -*- mode:C; c-file-style: "eay" -*- */

/* ====================================================================

 * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.

 * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions
@@ -58,8 +58,10 @@ 


static const int AES_DECRYPT = 0;

static const int AES_ENCRYPT = 1;

#define AES_MAXNR 14 /* array size can't be a const in C */

static const int AES_BLOCK_SIZE = 16; /* bytes */

/* Because array size can't be a const in C, the following two are macros.

   Both sizes are in bytes. */

#define AES_MAXNR 14

#define AES_BLOCK_SIZE 16



#ifdef  __cplusplus

extern "C" {
@@ -74,17 +76,31 @@ typedef struct aes_key_st AES_KEY; 


const char *AES_options(void);



int AES_set_encrypt_key(const unsigned char *userKey, const int bits, AES_KEY *key);

int AES_set_decrypt_key(const unsigned char *userKey, const int bits, AES_KEY *key);

int AES_set_encrypt_key(const unsigned char *userKey, const int bits,

	AES_KEY *key);

int AES_set_decrypt_key(const unsigned char *userKey, const int bits,

	AES_KEY *key);



void AES_encrypt(const unsigned char *in, unsigned char *out, const AES_KEY *key);

void AES_decrypt(const unsigned char *in, unsigned char *out, const AES_KEY *key);

void AES_encrypt(const unsigned char *in, unsigned char *out,

	const AES_KEY *key);

void AES_decrypt(const unsigned char *in, unsigned char *out,

	const AES_KEY *key);



void AES_ecb_encrypt(const unsigned char *in, unsigned char *out,

	const AES_KEY *key, const int enc);

void AES_cbc_encrypt(const unsigned char *in, unsigned char *out,

	const unsigned long length, const AES_KEY *key,

	unsigned char *ivec, const int enc);

void AES_cfb128_encrypt(const unsigned char *in, unsigned char *out,

	const unsigned long length, const AES_KEY *key,

	unsigned char *ivec, int *num, const int enc);

void AES_ofb128_encrypt(const unsigned char *in, unsigned char *out,

	const unsigned long length, const AES_KEY *key,

	unsigned char *ivec, int *num);

void AES_ctr128_encrypt(const unsigned char *in, unsigned char *out,

	const unsigned long length, const AES_KEY *key,

	unsigned char *counter, unsigned int *num);





#ifdef  __cplusplus

}

crypto/aes/aes_cbc.c

+1 −1
Original line number Diff line number Diff line 
/* crypto/aes/aes_cbc.c -*- mode:C; c-file-style: "eay" -*- */

/* ====================================================================

 * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.

 * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

crypto/aes/aes_cfb.c

0 → 100644
+151 −0
Original line number Diff line number Diff line 
/* crypto/aes/aes_cfb.c -*- mode:C; c-file-style: "eay" -*- */

/* ====================================================================

 * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 *

 * 1. Redistributions of source code must retain the above copyright

 *    notice, this list of conditions and the following disclaimer. 

 *

 * 2. Redistributions in binary form must reproduce the above copyright

 *    notice, this list of conditions and the following disclaimer in

 *    the documentation and/or other materials provided with the

 *    distribution.

 *

 * 3. All advertising materials mentioning features or use of this

 *    software must display the following acknowledgment:

 *    "This product includes software developed by the OpenSSL Project

 *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"

 *

 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to

 *    endorse or promote products derived from this software without

 *    prior written permission. For written permission, please contact

 *    openssl-core@openssl.org.

 *

 * 5. Products derived from this software may not be called "OpenSSL"

 *    nor may "OpenSSL" appear in their names without prior written

 *    permission of the OpenSSL Project.

 *

 * 6. Redistributions of any form whatsoever must retain the following

 *    acknowledgment:

 *    "This product includes software developed by the OpenSSL Project

 *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"

 *

 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY

 * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR

 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT

 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,

 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED

 * OF THE POSSIBILITY OF SUCH DAMAGE.

 * ====================================================================

 *

 */

/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)

 * All rights reserved.

 *

 * This package is an SSL implementation written

 * by Eric Young (eay@cryptsoft.com).

 * The implementation was written so as to conform with Netscapes SSL.

 * 

 * This library is free for commercial and non-commercial use as long as

 * the following conditions are aheared to.  The following conditions

 * apply to all code found in this distribution, be it the RC4, RSA,

 * lhash, DES, etc., code; not just the SSL code.  The SSL documentation

 * included with this distribution is covered by the same copyright terms

 * except that the holder is Tim Hudson (tjh@cryptsoft.com).

 * 

 * Copyright remains Eric Young's, and as such any Copyright notices in

 * the code are not to be removed.

 * If this package is used in a product, Eric Young should be given attribution

 * as the author of the parts of the library used.

 * This can be in the form of a textual message at program startup or

 * in documentation (online or textual) provided with the package.

 * 

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 * 1. Redistributions of source code must retain the copyright

 *    notice, this list of conditions and the following disclaimer.

 * 2. Redistributions in binary form must reproduce the above copyright

 *    notice, this list of conditions and the following disclaimer in the

 *    documentation and/or other materials provided with the distribution.

 * 3. All advertising materials mentioning features or use of this software

 *    must display the following acknowledgement:

 *    "This product includes cryptographic software written by

 *     Eric Young (eay@cryptsoft.com)"

 *    The word 'cryptographic' can be left out if the rouines from the library

 *    being used are not cryptographic related :-).

 * 4. If you include any Windows specific code (or a derivative thereof) from 

 *    the apps directory (application code) you must include an acknowledgement:

 *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"

 * 

 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND

 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

 * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE

 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS

 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT

 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY

 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

 * SUCH DAMAGE.

 * 

 * The licence and distribution terms for any publically available version or

 * derivative of this code cannot be changed.  i.e. this code cannot simply be

 * copied and put under another distribution licence

 * [including the GNU Public Licence.]

 */



#include <assert.h>

#include <openssl/aes.h>

#include "aes_locl.h"



/* The input and output encrypted as though 128bit cfb mode is being

 * used.  The extra state information to record how much of the

 * 128bit block we have used is contained in *num;

 */



void AES_cfb128_encrypt(const unsigned char *in, unsigned char *out,

	const unsigned long length, const AES_KEY *key,

	unsigned char *ivec, int *num, const int enc) {



	unsigned int n;

	unsigned long l = length;

	unsigned char c;



	assert(in && out && key && ivec && num);



	n = *num;



	if (enc) {

		while (l--) {

			if (n == 0) {

				AES_encrypt(ivec, ivec, key);

			}

			ivec[n] = *(out++) = *(in++) ^ ivec[n];

			n = (n+1) % AES_BLOCK_SIZE;

		}

	} else {

		while (l--) {

			if (n == 0) {

				AES_decrypt(ivec, ivec, key);

			}

			c = *(in);

			*(out++) = *(in++) ^ ivec[n];

			ivec[n] = c;

			n = (n+1) % AES_BLOCK_SIZE;

		}

	}



	*num=n;

}

crypto/aes/aes_core.c

+0 −10
Original line number Diff line number Diff line
@@ -715,16 +715,6 @@ static const u32 rcon[] = { 
	0x1B000000, 0x36000000, /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */

};



#define SWAP(x) (_lrotl(x, 8) & 0x00ff00ff | _lrotr(x, 8) & 0xff00ff00)



#ifdef _MSC_VER

#define GETU32(p) SWAP(*((u32 *)(p)))

#define PUTU32(ct, st) { *((u32 *)(ct)) = SWAP((st)); }

#else

#define GETU32(pt) (((u32)(pt)[0] << 24) ^ ((u32)(pt)[1] << 16) ^ ((u32)(pt)[2] <<  8) ^ ((u32)(pt)[3]))

#define PUTU32(ct, st) { (ct)[0] = (u8)((st) >> 24); (ct)[1] = (u8)((st) >> 16); (ct)[2] = (u8)((st) >>  8); (ct)[3] = (u8)(st); }

#endif



/**

 * Expand the cipher key into the encryption key schedule.

 */