generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

crypto/modes: make modes.h selfsufficient and rename block_f to block128_t.

Browse Source
This commit is contained in:
Andy Polyakov 2008-12-23 11:18:45 +00:00
parent 830457ce4f
commit 63fc7f848d
5 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crypto/modes/cbc128.c
View File

@ -48,7 +48,7 @@
* *
*/ */
#include <stddef.h> #include "modes.h"
#include <string.h> #include <string.h>
#ifndef MODES_DEBUG #ifndef MODES_DEBUG
@ -58,8 +58,6 @@
#endif #endif
#include <assert.h> #include <assert.h>
#include "modes.h"
#define STRICT_ALIGNMENT 1 #define STRICT_ALIGNMENT 1
#if defined(__i386) || defined(__i386__) || \ #if defined(__i386) || defined(__i386__) || \
defined(__x86_64) || defined(__x86_64__) || \ defined(__x86_64) || defined(__x86_64__) || \
@ -71,7 +69,7 @@
void CRYPTO_cbc128_encrypt(const unsigned char *in, unsigned char *out, void CRYPTO_cbc128_encrypt(const unsigned char *in, unsigned char *out,
size_t len, const void *key, size_t len, const void *key,
unsigned char ivec[16], block_f block) unsigned char ivec[16], block128_f block)
{ {
size_t n; size_t n;
const unsigned char *iv = ivec; const unsigned char *iv = ivec;
@ -120,7 +118,7 @@ void CRYPTO_cbc128_encrypt(const unsigned char *in, unsigned char *out,
void CRYPTO_cbc128_decrypt(const unsigned char *in, unsigned char *out, void CRYPTO_cbc128_decrypt(const unsigned char *in, unsigned char *out,
size_t len, const void *key, size_t len, const void *key,
unsigned char ivec[16], block_f block) unsigned char ivec[16], block128_f block)
{ {
size_t n; size_t n;
union { size_t align; unsigned char c[16]; } tmp; union { size_t align; unsigned char c[16]; } tmp;

12
crypto/modes/cfb128.c
View File

@ -48,7 +48,7 @@
* *
*/ */
#include <stddef.h> #include "modes.h"
#include <string.h> #include <string.h>
#ifndef MODES_DEBUG #ifndef MODES_DEBUG
@ -58,8 +58,6 @@
#endif #endif
#include <assert.h> #include <assert.h>
#include "modes.h"
#define STRICT_ALIGNMENT #define STRICT_ALIGNMENT
#if defined(__i386) || defined(__i386__) || \ #if defined(__i386) || defined(__i386__) || \
defined(__x86_64) || defined(__x86_64__) || \ defined(__x86_64) || defined(__x86_64__) || \
@ -75,7 +73,7 @@
void CRYPTO_cfb128_encrypt(const unsigned char *in, unsigned char *out, void CRYPTO_cfb128_encrypt(const unsigned char *in, unsigned char *out,
size_t len, const void *key, size_t len, const void *key,
unsigned char ivec[16], int *num, unsigned char ivec[16], int *num,
int enc, block_f block) int enc, block128_f block)
{ {
unsigned int n; unsigned int n;
size_t l = 0; size_t l = 0;
@ -184,7 +182,7 @@ void CRYPTO_cfb128_encrypt(const unsigned char *in, unsigned char *out,
static void cfbr_encrypt_block(const unsigned char *in,unsigned char *out, static void cfbr_encrypt_block(const unsigned char *in,unsigned char *out,
int nbits,const void *key, int nbits,const void *key,
unsigned char ivec[16],int enc, unsigned char ivec[16],int enc,
block_f block) block128_f block)
{ {
int n,rem,num; int n,rem,num;
unsigned char ovec[16*2 + 1]; /* +1 because we dererefence (but don't use) one byte off the end */ unsigned char ovec[16*2 + 1]; /* +1 because we dererefence (but don't use) one byte off the end */
@ -218,7 +216,7 @@ static void cfbr_encrypt_block(const unsigned char *in,unsigned char *out,
void CRYPTO_cfb128_1_encrypt(const unsigned char *in, unsigned char *out, void CRYPTO_cfb128_1_encrypt(const unsigned char *in, unsigned char *out,
size_t bits, const void *key, size_t bits, const void *key,
unsigned char ivec[16], int *num, unsigned char ivec[16], int *num,
int enc, block_f block) int enc, block128_f block)
{ {
size_t n; size_t n;
unsigned char c[1],d[1]; unsigned char c[1],d[1];
@ -238,7 +236,7 @@ void CRYPTO_cfb128_1_encrypt(const unsigned char *in, unsigned char *out,
void CRYPTO_cfb128_8_encrypt(const unsigned char *in, unsigned char *out, void CRYPTO_cfb128_8_encrypt(const unsigned char *in, unsigned char *out,
size_t length, const void *key, size_t length, const void *key,
unsigned char ivec[16], int *num, unsigned char ivec[16], int *num,
int enc, block_f block) int enc, block128_f block)
{ {
size_t n; size_t n;

6
crypto/modes/ctr128.c
View File

@ -48,7 +48,7 @@
* *
*/ */
#include <stddef.h> #include "modes.h"
#include <string.h> #include <string.h>
#ifndef MODES_DEBUG #ifndef MODES_DEBUG
@ -58,8 +58,6 @@
#endif #endif
#include <assert.h> #include <assert.h>
#include "modes.h"
typedef unsigned int u32; typedef unsigned int u32;
typedef unsigned char u8; typedef unsigned char u8;
@ -128,7 +126,7 @@ static void ctr128_inc_aligned(unsigned char *counter) {
void CRYPTO_ctr128_encrypt(const unsigned char *in, unsigned char *out, void CRYPTO_ctr128_encrypt(const unsigned char *in, unsigned char *out,
size_t len, const void *key, size_t len, const void *key,
unsigned char ivec[16], unsigned char ecount_buf[16], unsigned char ivec[16], unsigned char ecount_buf[16],
unsigned int *num, block_f block) unsigned int *num, block128_f block)
{ {
unsigned int n; unsigned int n;
size_t l=0; size_t l=0;

26
crypto/modes/modes.h
View File

@ -1,34 +1,42 @@
typedef void (*block_f)(const unsigned char in[16], /* ====================================================================
* Copyright (c) 2008 The OpenSSL Project. All rights reserved.
*
* Rights for redistribution and usage in source and binary
* forms are granted according to the OpenSSL license.
*/
#include <stddef.h>
typedef void (*block128_f)(const unsigned char in[16],
unsigned char out[16], unsigned char out[16],
const void *key); const void *key);
void CRYPTO_cbc128_encrypt(const unsigned char *in, unsigned char *out, void CRYPTO_cbc128_encrypt(const unsigned char *in, unsigned char *out,
size_t len, const void *key, size_t len, const void *key,
unsigned char ivec[16], block_f block); unsigned char ivec[16], block128_f block);
void CRYPTO_cbc128_decrypt(const unsigned char *in, unsigned char *out, void CRYPTO_cbc128_decrypt(const unsigned char *in, unsigned char *out,
size_t len, const void *key, size_t len, const void *key,
unsigned char ivec[16], block_f block); unsigned char ivec[16], block128_f block);
void CRYPTO_ctr128_encrypt(const unsigned char *in, unsigned char *out, void CRYPTO_ctr128_encrypt(const unsigned char *in, unsigned char *out,
size_t len, const void *key, size_t len, const void *key,
unsigned char ivec[16], unsigned char ecount_buf[16], unsigned char ivec[16], unsigned char ecount_buf[16],
unsigned int *num, block_f block); unsigned int *num, block128_f block);
void CRYPTO_ofb128_encrypt(const unsigned char *in, unsigned char *out, void CRYPTO_ofb128_encrypt(const unsigned char *in, unsigned char *out,
size_t len, const void *key, size_t len, const void *key,
unsigned char ivec[16], int *num, unsigned char ivec[16], int *num,
block_f block); block128_f block);
void CRYPTO_cfb128_encrypt(const unsigned char *in, unsigned char *out, void CRYPTO_cfb128_encrypt(const unsigned char *in, unsigned char *out,
size_t len, const void *key, size_t len, const void *key,
unsigned char ivec[16], int *num, unsigned char ivec[16], int *num,
int enc, block_f block); int enc, block128_f block);
void CRYPTO_cfb128_8_encrypt(const unsigned char *in, unsigned char *out, void CRYPTO_cfb128_8_encrypt(const unsigned char *in, unsigned char *out,
size_t length, const void *key, size_t length, const void *key,
unsigned char ivec[16], int *num, unsigned char ivec[16], int *num,
int enc, block_f block); int enc, block128_f block);
void CRYPTO_cfb128_1_encrypt(const unsigned char *in, unsigned char *out, void CRYPTO_cfb128_1_encrypt(const unsigned char *in, unsigned char *out,
size_t bits, const void *key, size_t bits, const void *key,
unsigned char ivec[16], int *num, unsigned char ivec[16], int *num,
int enc, block_f block); int enc, block128_f block);

6
crypto/modes/ofb128.c
View File

@ -48,7 +48,7 @@
* *
*/ */
#include <stddef.h> #include "modes.h"
#include <string.h> #include <string.h>
#ifndef MODES_DEBUG #ifndef MODES_DEBUG
@ -58,8 +58,6 @@
#endif #endif
#include <assert.h> #include <assert.h>
#include "modes.h"
#define STRICT_ALIGNMENT #define STRICT_ALIGNMENT
#if defined(__i386) || defined(__i386__) || \ #if defined(__i386) || defined(__i386__) || \
defined(__x86_64) || defined(__x86_64__) || \ defined(__x86_64) || defined(__x86_64__) || \
@ -75,7 +73,7 @@
void CRYPTO_ofb128_encrypt(const unsigned char *in, unsigned char *out, void CRYPTO_ofb128_encrypt(const unsigned char *in, unsigned char *out,
size_t len, const void *key, size_t len, const void *key,
unsigned char ivec[16], int *num, unsigned char ivec[16], int *num,
block_f block) block128_f block)
{ {
unsigned int n; unsigned int n;
size_t l=0; size_t l=0;