Skip to content

Commit

Permalink
md5 added, aff writer test started
Browse files Browse the repository at this point in the history
git-svn-id: file:///Users/avp/tmp/svn.20121212/LHPC/aff/trunk@105 65d2813f-f11f-0410-b17b-8647a28db151
  • Loading branch information
avp committed Aug 18, 2007
1 parent df86727 commit cd1ced0
Show file tree
Hide file tree
Showing 12 changed files with 693 additions and 13 deletions.
7 changes: 5 additions & 2 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,10 @@ lhpc-aff cmd [args]

Useful prieces:

MD5 checksum routines are in <openssl/md5.h>.
MD5 checksum routines are in <openssl/md5.h>. -- building it is a mess on BG/L,
get the reference implementation from RFC 1321.

Treap management routines are written.
Stable routines are written.

Tree routines are complete.
Aff interface is written.
8 changes: 7 additions & 1 deletion lib/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ library = liblhpc-aff.a
sources=$(treap.sources) \
$(stable.sources) \
$(tree.sources) \
$(node.sources)
$(node.sources) \
$(md5.sources)

treap.sources = treap-insert.c \
treap-fini.c \
Expand Down Expand Up @@ -65,6 +66,10 @@ node.sources = node-foreach.c \
node.headers = node-i.h \
node.h

md5.sources = md5.c

md5.headers = md5.h

.PHONY: all clean realclean install

all: $(library)
Expand All @@ -90,3 +95,4 @@ $(node.sources:%.c=%.o): $(node.headers)
$(treap.sources:%.c=%.o): $(treap.headers)
$(stable.sources:%.c=%.o): $(stable.headers) treap.h
$(tree.sources:%.c=%.o): $(tree.headers) treap.h stable.h node.h node-i.h
$(md5.sources:%.c=%.o): $(md5.headers)
11 changes: 11 additions & 0 deletions lib/aff-i.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,15 @@
#define MARK_6f9650e1_45e8_4695_81a9_8c3672baee90
#include "aff.h"

struct AffWriter_t {
FILE *file;
struct AffSTable_s *stable;
struct AffTree_s *tree;
const char *error;
off_t position;
off_t data_start;
off_t data_size;
struct AffMD5_s data_md5;
};

#endif /* !defined(MARK_6f9650e1_45e8_4695_81a9_8c3672baee90) */
18 changes: 14 additions & 4 deletions lib/aff.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
#ifndef MARK_c7329614_7d7a_4efe_9f6d_87477961bc99
#define MARK_c7329614_7d7a_4efe_9f6d_87477961bc99

/* AFF imported types */
struct AffNode_s;

/* AFF objects. Writers.
*
* writer() prepares to write an aff file. If it exists the file is deleted
Expand All @@ -16,12 +19,16 @@ struct AffWriter_s;
struct AffWriter_s *aff_writer(const char *file_name);
int aff_writer_close(struct AffWriter_s *aff);
const char *aff_writer_errstr(struct AffWriter_s *aff);
struct AffSTable_s *aff_stable(struct AffWriter_s *aff);
struct AffNode_t *aff_writer_root(struct AffWriter_s *aff);
struct AffSTable_s *aff_writer_stable(struct AffWriter_s *aff);
struct AffTree_s *aff_writer_tree(struct AffWriter_s *aff);
struct AffNode_s *aff_writer_root(struct AffWriter_s *aff);
void aff_writer_foreach(struct AffWriter_s *aff,
void (*proc)(struct AffNode_s *node,
void *arg),
void *arg);
struct AffNode_s *aff_writer_mkdir(struct AffWriter_s *aff,
struct AffNode_s *dir,
const char *name);
int aff_node_put_char(struct AffWriter_s *aff,
struct AffNode_s *n,
const char *d,
Expand Down Expand Up @@ -49,17 +56,20 @@ int aff_node_put_complex(struct AffWriter_s *aff,
* ignore tail.
*/
struct AffReader_s;
struct AffReaderNode_s;

struct AffReader_s *aff_reader(const char *file_name);
int aff_close_reader(struct AffReader_s *aff);
const char *aff_reader_errstr(struct AffReader_s *aff);
struct AffTree_s *aff_reader_tree(struct AffReader_s *aff);
struct AffSTable_s *aff_reader_stable(const struct AffReader_s *aff);
struct AffNode_t *aff_reader_root(struct AffReader_s *aff);
struct AffNode_s *aff_reader_root(struct AffReader_s *aff);
void aff_reader_foreach(struct AffReader_s *aff,
void (*proc)(struct AffNode_s *node,
void *arg),
void *arg);
struct AffNode_s *aff_reader_chdir(struct AffReader_s *aff,
struct AffNode_s *dir,
const char *name);
int aff_node_get_char(const struct AffReader_s *aff,
const struct AffNode_s *n,
char *d,
Expand Down
265 changes: 265 additions & 0 deletions lib/md5.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,265 @@
/* Derived from RFC 1321. The original copyright may apply.
*
* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
* rights reserved.
*
* License to copy and use this software is granted provided that it
* is identified as the "RSA Data Security, Inc. MD5 Message-Digest
* Algorithm" in all material mentioning or referencing this software
* or this function.
*
* License is also granted to make and use derivative works provided
* that such works are identified as "derived from the RSA Data
* Security, Inc. MD5 Message-Digest Algorithm" in all material
* mentioning or referencing the derived work.
*
* RSA Data Security, Inc. makes no representations concerning either
* the merchantability of this software or the suitability of this
* software for any particular purpose. It is provided "as is"
* without express or implied warranty of any kind.
*
* These notices must be retained in any copies of any part of this
* documentation and/or software.
*/
#include <stdint.h>
#include <string.h>
#include "md5.h"

/* Constants for MD5Transform routine.
*/
enum {
S11 = 7,
S12 = 12,
S13 = 17,
S14 = 22,
S21 = 5,
S22 = 9,
S23 = 14,
S24 = 20,
S31 = 4,
S32 = 11,
S33 = 16,
S34 = 23,
S41 = 6,
S42 = 10,
S43 = 15,
S44 = 21
};

/* F, G, H and I are basic MD5 functions.
*/
#define F(x, y, z) (((x) & (y)) | ((~x) & (z)))
#define G(x, y, z) (((x) & (z)) | ((y) & (~z)))
#define H(x, y, z) ((x) ^ (y) ^ (z))
#define I(x, y, z) ((y) ^ ((x) | (~z)))

/* ROTATE_LEFT rotates x left n bits.
*/
#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))

/* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4.
* Rotation is separate from addition to prevent recomputation.
*/
#define FF(a, b, c, d, x, s, ac) { \
(a) += F((b), (c), (d)) + (x) + (uint32_t)(ac); \
(a) = ROTATE_LEFT((a), (s)); \
(a) += (b); }
#define GG(a, b, c, d, x, s, ac) { \
(a) += G((b), (c), (d)) + (x) + (uint32_t)(ac); \
(a) = ROTATE_LEFT((a), (s)); \
(a) += (b); }
#define HH(a, b, c, d, x, s, ac) { \
(a) += H((b), (c), (d)) + (x) + (uint32_t)(ac); \
(a) = ROTATE_LEFT((a), (s)); \
(a) += (b); }
#define II(a, b, c, d, x, s, ac) { \
(a) += I((b), (c), (d)) + (x) + (uint32_t)(ac); \
(a) = ROTATE_LEFT((a), (s)); \
(a) += (b); }

static void
decode(uint32_t *output, const uint8_t *input , uint32_t len)
{
uint32_t i, j;

for (i = 0, j = 0; j < len; i++, j += 4)
output[i] = ((uint32_t)input[j]) | (((uint32_t)input[j+1]) << 8) |
(((uint32_t)input[j+2]) << 16) | (((uint32_t)input[j+3]) << 24);
}

static void
encode(uint8_t *output, const uint32_t *input, uint32_t len)
{
uint32_t i, j;

for (i = 0, j = 0; j < len; i++, j += 4) {
output[j] = (uint8_t)(input[i] & 0xff);
output[j+1] = (uint8_t)((input[i] >> 8) & 0xff);
output[j+2] = (uint8_t)((input[i] >> 16) & 0xff);
output[j+3] = (uint8_t)((input[i] >> 24) & 0xff);
}
}

static void
transform(uint32_t state[4], const uint8_t block[64])
{
uint32_t a = state[0], b = state[1], c = state[2], d = state[3], x[16];

decode (x, block, 64);

/* Round 1 */
FF(a, b, c, d, x[ 0], S11, 0xd76aa478); /* 1 */
FF(d, a, b, c, x[ 1], S12, 0xe8c7b756); /* 2 */
FF(c, d, a, b, x[ 2], S13, 0x242070db); /* 3 */
FF(b, c, d, a, x[ 3], S14, 0xc1bdceee); /* 4 */
FF(a, b, c, d, x[ 4], S11, 0xf57c0faf); /* 5 */
FF(d, a, b, c, x[ 5], S12, 0x4787c62a); /* 6 */
FF(c, d, a, b, x[ 6], S13, 0xa8304613); /* 7 */
FF(b, c, d, a, x[ 7], S14, 0xfd469501); /* 8 */
FF(a, b, c, d, x[ 8], S11, 0x698098d8); /* 9 */
FF(d, a, b, c, x[ 9], S12, 0x8b44f7af); /* 10 */
FF(c, d, a, b, x[10], S13, 0xffff5bb1); /* 11 */
FF(b, c, d, a, x[11], S14, 0x895cd7be); /* 12 */
FF(a, b, c, d, x[12], S11, 0x6b901122); /* 13 */
FF(d, a, b, c, x[13], S12, 0xfd987193); /* 14 */
FF(c, d, a, b, x[14], S13, 0xa679438e); /* 15 */
FF(b, c, d, a, x[15], S14, 0x49b40821); /* 16 */

/* Round 2 */
GG(a, b, c, d, x[ 1], S21, 0xf61e2562); /* 17 */
GG(d, a, b, c, x[ 6], S22, 0xc040b340); /* 18 */
GG(c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */
GG(b, c, d, a, x[ 0], S24, 0xe9b6c7aa); /* 20 */
GG(a, b, c, d, x[ 5], S21, 0xd62f105d); /* 21 */
GG(d, a, b, c, x[10], S22, 0x2441453); /* 22 */
GG(c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */
GG(b, c, d, a, x[ 4], S24, 0xe7d3fbc8); /* 24 */
GG(a, b, c, d, x[ 9], S21, 0x21e1cde6); /* 25 */
GG(d, a, b, c, x[14], S22, 0xc33707d6); /* 26 */
GG(c, d, a, b, x[ 3], S23, 0xf4d50d87); /* 27 */
GG(b, c, d, a, x[ 8], S24, 0x455a14ed); /* 28 */
GG(a, b, c, d, x[13], S21, 0xa9e3e905); /* 29 */
GG(d, a, b, c, x[ 2], S22, 0xfcefa3f8); /* 30 */
GG(c, d, a, b, x[ 7], S23, 0x676f02d9); /* 31 */
GG(b, c, d, a, x[12], S24, 0x8d2a4c8a); /* 32 */

/* Round 3 */
HH(a, b, c, d, x[ 5], S31, 0xfffa3942); /* 33 */
HH(d, a, b, c, x[ 8], S32, 0x8771f681); /* 34 */
HH(c, d, a, b, x[11], S33, 0x6d9d6122); /* 35 */
HH(b, c, d, a, x[14], S34, 0xfde5380c); /* 36 */
HH(a, b, c, d, x[ 1], S31, 0xa4beea44); /* 37 */
HH(d, a, b, c, x[ 4], S32, 0x4bdecfa9); /* 38 */
HH(c, d, a, b, x[ 7], S33, 0xf6bb4b60); /* 39 */
HH(b, c, d, a, x[10], S34, 0xbebfbc70); /* 40 */
HH(a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */
HH(d, a, b, c, x[ 0], S32, 0xeaa127fa); /* 42 */
HH(c, d, a, b, x[ 3], S33, 0xd4ef3085); /* 43 */
HH(b, c, d, a, x[ 6], S34, 0x4881d05); /* 44 */
HH(a, b, c, d, x[ 9], S31, 0xd9d4d039); /* 45 */
HH(d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */
HH(c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */
HH(b, c, d, a, x[ 2], S34, 0xc4ac5665); /* 48 */

/* Round 4 */
II(a, b, c, d, x[ 0], S41, 0xf4292244); /* 49 */
II(d, a, b, c, x[ 7], S42, 0x432aff97); /* 50 */
II(c, d, a, b, x[14], S43, 0xab9423a7); /* 51 */
II(b, c, d, a, x[ 5], S44, 0xfc93a039); /* 52 */
II(a, b, c, d, x[12], S41, 0x655b59c3); /* 53 */
II(d, a, b, c, x[ 3], S42, 0x8f0ccc92); /* 54 */
II(c, d, a, b, x[10], S43, 0xffeff47d); /* 55 */
II(b, c, d, a, x[ 1], S44, 0x85845dd1); /* 56 */
II(a, b, c, d, x[ 8], S41, 0x6fa87e4f); /* 57 */
II(d, a, b, c, x[15], S42, 0xfe2ce6e0); /* 58 */
II(c, d, a, b, x[ 6], S43, 0xa3014314); /* 59 */
II(b, c, d, a, x[13], S44, 0x4e0811a1); /* 60 */
II(a, b, c, d, x[ 4], S41, 0xf7537e82); /* 61 */
II(d, a, b, c, x[11], S42, 0xbd3af235); /* 62 */
II(c, d, a, b, x[ 2], S43, 0x2ad7d2bb); /* 63 */
II(b, c, d, a, x[ 9], S44, 0xeb86d391); /* 64 */

state[0] += a;
state[1] += b;
state[2] += c;
state[3] += d;

/* Zeroize sensitive information. */
memset (x, 0, sizeof (x));
}


static const uint8_t PADDING[64] = {
0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};


void
aff_md5_init(struct AffMD5_s *context)
{
context->count[0] = context->count[1] = 0;

/* Load magic initialization constants. */
context->state[0] = 0x67452301;
context->state[1] = 0xefcdab89;
context->state[2] = 0x98badcfe;
context->state[3] = 0x10325476;
}

void
aff_md5_update(struct AffMD5_s *context,
const uint8_t *input,
uint32_t inputLen)
{
uint32_t i, index, partLen;

/* Compute number of bytes mod 64 */
index = ((context->count[0] >> 3) & 0x3F);

/* Update number of bits */
if ((context->count[0] += (inputLen << 3)) < (inputLen << 3))
context->count[1]++;
context->count[1] += (inputLen >> 29);
partLen = 64 - index;

/* Transform as many times as possible. */
if (inputLen >= partLen) {
memcpy(&context->buffer[index], input, partLen);
transform(context->state, context->buffer);

for (i = partLen; i + 63 < inputLen; i += 64)
transform(context->state, &input[i]);

index = 0;
} else {
i = 0;
}
/* Buffer remaining input */
memcpy(&context->buffer[index], &input[i], inputLen-i);
}

void
aff_md5_final(uint8_t digest[16], struct AffMD5_s *context)
{
uint8_t bits[8];
uint32_t index, padLen;

/* Save number of bits */
encode(bits, context->count, 8);

/* Pad out to 56 mod 64. */
index = ((context->count[0] >> 3) & 0x3f);
padLen = (index < 56) ? (56 - index) : (120 - index);
aff_md5_update(context, PADDING, padLen);

/* Append length (before padding) */
aff_md5_update(context, bits, 8);

/* Store state in digest */
encode(digest, context->state, 16);

/* Zeroize sensitive information. */
memset (context, 0, sizeof (*context));
}
Loading

0 comments on commit cd1ced0

Please sign in to comment.