Manually reformat aes_core.c
Add aes_core.c to the list of files not processed by openssl-format-source Conflicts: crypto/aes/aes_core.c Reviewed-by: Tim Hudson <tjh@openssl.org>
This commit is contained in:
parent
9b214383c1
commit
e4e5457c29
@ -626,7 +626,8 @@ static const u32 rcon[] = {
|
|||||||
* Expand the cipher key into the encryption key schedule.
|
* Expand the cipher key into the encryption key schedule.
|
||||||
*/
|
*/
|
||||||
int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
|
int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
|
||||||
AES_KEY *key) {
|
AES_KEY *key)
|
||||||
|
{
|
||||||
|
|
||||||
u32 *rk;
|
u32 *rk;
|
||||||
int i = 0;
|
int i = 0;
|
||||||
@ -727,7 +728,8 @@ int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
|
|||||||
* Expand the cipher key into the decryption key schedule.
|
* Expand the cipher key into the decryption key schedule.
|
||||||
*/
|
*/
|
||||||
int private_AES_set_decrypt_key(const unsigned char *userKey, const int bits,
|
int private_AES_set_decrypt_key(const unsigned char *userKey, const int bits,
|
||||||
AES_KEY *key) {
|
AES_KEY *key)
|
||||||
|
{
|
||||||
|
|
||||||
u32 *rk;
|
u32 *rk;
|
||||||
int i, j, status;
|
int i, j, status;
|
||||||
@ -970,7 +972,8 @@ void AES_encrypt(const unsigned char *in, unsigned char *out,
|
|||||||
* in and out can overlap
|
* in and out can overlap
|
||||||
*/
|
*/
|
||||||
void AES_decrypt(const unsigned char *in, unsigned char *out,
|
void AES_decrypt(const unsigned char *in, unsigned char *out,
|
||||||
const AES_KEY *key) {
|
const AES_KEY *key)
|
||||||
|
{
|
||||||
|
|
||||||
const u32 *rk;
|
const u32 *rk;
|
||||||
u32 s0, s1, s2, s3, t0, t1, t2, t3;
|
u32 s0, s1, s2, s3, t0, t1, t2, t3;
|
||||||
@ -1202,7 +1205,8 @@ static const u32 rcon[] = {
|
|||||||
* Expand the cipher key into the encryption key schedule.
|
* Expand the cipher key into the encryption key schedule.
|
||||||
*/
|
*/
|
||||||
int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
|
int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
|
||||||
AES_KEY *key) {
|
AES_KEY *key)
|
||||||
|
{
|
||||||
u32 *rk;
|
u32 *rk;
|
||||||
int i = 0;
|
int i = 0;
|
||||||
u32 temp;
|
u32 temp;
|
||||||
@ -1302,7 +1306,8 @@ int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
|
|||||||
* Expand the cipher key into the decryption key schedule.
|
* Expand the cipher key into the decryption key schedule.
|
||||||
*/
|
*/
|
||||||
int private_AES_set_decrypt_key(const unsigned char *userKey, const int bits,
|
int private_AES_set_decrypt_key(const unsigned char *userKey, const int bits,
|
||||||
AES_KEY *key) {
|
AES_KEY *key)
|
||||||
|
{
|
||||||
|
|
||||||
u32 *rk;
|
u32 *rk;
|
||||||
int i, j, status;
|
int i, j, status;
|
||||||
|
@ -88,7 +88,7 @@ do
|
|||||||
case `basename $j` in
|
case `basename $j` in
|
||||||
# the list of files that indent is unable to handle correctly
|
# the list of files that indent is unable to handle correctly
|
||||||
# that we simply leave alone for manual formatting now
|
# that we simply leave alone for manual formatting now
|
||||||
obj_dat.h)
|
obj_dat.h|aes_core.c)
|
||||||
echo "skipping $j"
|
echo "skipping $j"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user