dropbear: keyring.c annotate

annotate keyring.c @ 138:b1edc9158f6c libtomcrypt

Pristine compilation works

author	Matt Johnston <matt@ucc.asn.au>
date	Fri, 17 Dec 2004 06:27:09 +0000
parents	d7da3b1e1540
children

rev	line source
0 d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1 /* LibTomCrypt, modular cryptographic library -- Tom St Denis
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	2 *
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	3 * LibTomCrypt is a library that provides various cryptographic
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	4 * algorithms in a highly modular and flexible manner.
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	5 *
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	6 * The library is free for all purposes without any express
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	7 * guarantee it works.
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	8 *
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	9 * Tom St Denis, [email protected], http://libtomcrypt.org
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	10 */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	11 /* Provides keyring functionality for libtomcrypt, Tom St Denis */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	12 #include <mycrypt.h>
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	13
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	14 #ifdef KR
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	15
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	16 static const unsigned char key_magic[4] = { 0x12, 0x34, 0x56, 0x78 };
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	17 static const unsigned char file_magic[4] = { 0x9A, 0xBC, 0xDE, 0xF0 };
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	18 static const unsigned char sign_magic[4] = { 0x87, 0x56, 0x43, 0x21 };
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	19 static const unsigned char enc_magic[4] = { 0x0F, 0xED, 0xCB, 0xA9 };
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	20
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	21 static const unsigned long crc_table[256] = {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	22 0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	23 0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	24 0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	25 0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	26 0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	27 0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	28 0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	29 0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	30 0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	31 0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	32 0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	33 0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	34 0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	35 0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	36 0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	37 0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	38 0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	39 0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	40 0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	41 0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	42 0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	43 0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	44 0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	45 0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	46 0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	47 0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	48 0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	49 0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	50 0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	51 0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	52 0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	53 0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	54 0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	55 0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	56 0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	57 0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	58 0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	59 0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	60 0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	61 0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	62 0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	63 0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	64 0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	65 0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	66 0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	67 0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	68 0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	69 0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	70 0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	71 0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	72 0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	73 0x2d02ef8dUL
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	74 };
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	75
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	76 #define DO1(buf) crc = crc_table[(crc ^ (*buf++)) & 0xff] ^ (crc >> 8);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	77 #define DO2(buf) DO1(buf); DO1(buf);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	78 #define DO4(buf) DO2(buf); DO2(buf);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	79 #define DO8(buf) DO4(buf); DO4(buf);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	80
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	81 static unsigned long crc32 (unsigned long crc, const unsigned char *buf, unsigned long len)
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	82 {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	83 //_ARGCHK(buf != NULL && len == 0);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	84 crc = crc ^ 0xffffffffL;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	85 while (len >= 8) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	86 DO8 (buf);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	87 len -= 8;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	88 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	89
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	90 if (len > 0) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	91 do {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	92 DO1 (buf);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	93 } while (--len > 0);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	94 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	95 return crc ^ 0xffffffffUL;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	96 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	97
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	98 int kr_init(pk_key **pk)
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	99 {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	100 _ARGCHK(pk != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	101
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	102 *pk = XCALLOC(1, sizeof(pk_key));
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	103 if (*pk == NULL) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	104 return CRYPT_MEM;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	105 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	106 (*pk)->system = NON_KEY;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	107 return CRYPT_OK;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	108 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	109
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	110 unsigned long kr_crc(const unsigned char name, const unsigned char email, const unsigned char *description)
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	111 {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	112 unsigned long crc;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	113 _ARGCHK(name != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	114 _ARGCHK(email != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	115 _ARGCHK(description != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	116 crc = crc32(0UL, NULL, 0UL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	117 crc = crc32(crc, name, (unsigned long)MIN(MAXLEN, strlen((char *)name)));
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	118 crc = crc32(crc, email, (unsigned long)MIN(MAXLEN, strlen((char *)email)));
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	119 return crc32(crc, description, (unsigned long)MIN(MAXLEN, strlen((char *)description)));
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	120 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	121
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	122 pk_key kr_find(pk_key pk, unsigned long ID)
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	123 {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	124 _ARGCHK(pk != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	125
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	126 while (pk != NULL) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	127 if (pk->system != NON_KEY && pk->ID == ID) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	128 return pk;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	129 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	130 pk = pk->next;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	131 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	132 return NULL;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	133 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	134
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	135 pk_key kr_find_name(pk_key pk, const char *name)
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	136 {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	137 _ARGCHK(pk != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	138 _ARGCHK(name != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	139
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	140 while (pk != NULL) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	141 if (pk->system != NON_KEY && strncmp((char )pk->name, (char )name, sizeof(pk->name)-1) == 0) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	142 return pk;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	143 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	144 pk = pk->next;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	145 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	146 return NULL;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	147 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	148
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	149
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	150 int kr_add(pk_key pk, int key_type, int sys, const unsigned char name,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	151 const unsigned char email, const unsigned char description, const _pk_key *key)
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	152 {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	153 _ARGCHK(pk != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	154 _ARGCHK(name != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	155 _ARGCHK(email != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	156 _ARGCHK(description != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	157 _ARGCHK(key != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	158
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	159 /* check parameters */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	160 if (key_type != PK_PRIVATE && key_type != PK_PRIVATE_OPTIMIZED && key_type != PK_PUBLIC) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	161 return CRYPT_PK_INVALID_TYPE;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	162 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	163
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	164 if (sys != RSA_KEY && sys != DH_KEY && sys != ECC_KEY) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	165 return CRYPT_PK_INVALID_SYSTEM;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	166 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	167
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	168 /* see if its a dupe */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	169 if (kr_find(pk, kr_crc(name, email, description)) != NULL) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	170 return CRYPT_PK_DUP;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	171 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	172
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	173 /* find spot in key ring */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	174 while (pk->system != NON_KEY) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	175 if (pk->next == NULL) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	176 return CRYPT_ERROR;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	177 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	178 pk = pk->next;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	179 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	180
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	181 /* now we have a spot make a next spot */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	182 pk->next = XCALLOC(1, sizeof(pk_key));
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	183 if (pk->next == NULL) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	184 return CRYPT_MEM;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	185 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	186 pk->next->system = NON_KEY;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	187
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	188 /* now add this new data to this ring spot */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	189 pk->key_type = key_type;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	190 pk->system = sys;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	191 strncpy((char )pk->name, (char )name, sizeof(pk->name)-1);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	192 strncpy((char )pk->email, (char )email, sizeof(pk->email)-1);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	193 strncpy((char )pk->description, (char )description, sizeof(pk->description)-1);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	194 pk->ID = kr_crc(pk->name, pk->email, pk->description);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	195
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	196 /* clear the memory area */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	197 zeromem(&(pk->key), sizeof(pk->key));
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	198
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	199 /* copy the key */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	200 switch (sys) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	201 case RSA_KEY:
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	202 memcpy(&(pk->key.rsa), &(key->rsa), sizeof(key->rsa));
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	203 break;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	204 case DH_KEY:
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	205 memcpy(&(pk->key.dh), &(key->dh), sizeof(key->dh));
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	206 break;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	207 case ECC_KEY:
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	208 memcpy(&(pk->key.ecc), &(key->ecc), sizeof(key->ecc));
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	209 break;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	210 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	211 return CRYPT_OK;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	212 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	213
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	214 int kr_del(pk_key **_pk, unsigned long ID)
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	215 {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	216 pk_key ppk, pk;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	217
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	218 _ARGCHK(_pk != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	219
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	220 pk = *_pk;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	221 ppk = NULL;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	222 while (pk->system != NON_KEY && pk->ID != ID) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	223 ppk = pk;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	224 pk = pk->next;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	225 if (pk == NULL) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	226 return CRYPT_PK_NOT_FOUND;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	227 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	228 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	229
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	230 switch (pk->system) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	231 case RSA_KEY:
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	232 rsa_free(&(pk->key.rsa));
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	233 break;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	234 case DH_KEY:
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	235 dh_free(&(pk->key.dh));
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	236 break;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	237 case ECC_KEY:
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	238 ecc_free(&(pk->key.ecc));
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	239 break;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	240 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	241
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	242 if (ppk == NULL) { /* the first element matches the ID */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	243 ppk = pk->next; /* get the 2nd element */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	244 XFREE(pk); /* free the first */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	245 _pk = ppk; / make the first element the second */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	246 } else { /* (not) first element matches the ID */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	247 ppk->next = pk->next; /* make the previous'es next point to the current next */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	248 XFREE(pk); /* free the element */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	249 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	250 return CRYPT_OK;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	251 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	252
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	253 int kr_clear(pk_key **pk)
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	254 {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	255 int err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	256 _ARGCHK(pk != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	257
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	258 while ((*pk)->system != NON_KEY) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	259 if ((err = kr_del(pk, (*pk)->ID)) != CRYPT_OK) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	260 return err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	261 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	262 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	263 XFREE(*pk);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	264 *pk = NULL;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	265 return CRYPT_OK;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	266 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	267
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	268 static unsigned long _write(unsigned char buf, unsigned long len, FILE f, symmetric_CTR *ctr)
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	269 {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	270 #ifdef NO_FILE
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	271 return 0;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	272 #else
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	273 _ARGCHK(buf != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	274 _ARGCHK(f != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	275 if (ctr != NULL) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	276 if (ctr_encrypt(buf, buf, len, ctr) != CRYPT_OK) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	277 return 0;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	278 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	279 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	280 return (unsigned long)fwrite(buf, 1, (size_t)len, f);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	281 #endif
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	282 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	283
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	284 static unsigned long _read(unsigned char buf, unsigned long len, FILE f, symmetric_CTR *ctr)
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	285 {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	286 #ifdef NO_FILE
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	287 return 0;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	288 #else
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	289 unsigned long y;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	290 _ARGCHK(buf != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	291 _ARGCHK(f != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	292 y = (unsigned long)fread(buf, 1, (size_t)len, f);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	293 if (ctr != NULL) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	294 if (ctr_decrypt(buf, buf, y, ctr) != CRYPT_OK) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	295 return 0;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	296 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	297 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	298 return y;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	299 #endif
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	300 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	301
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	302 int kr_export(pk_key pk, unsigned long ID, int key_type, unsigned char out, unsigned long *outlen)
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	303 {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	304 unsigned char buf[8192], *obuf;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	305 pk_key *ppk;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	306 unsigned long len;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	307 int err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	308
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	309 _ARGCHK(pk != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	310 _ARGCHK(out != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	311 _ARGCHK(outlen != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	312
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	313 /* find the desired key */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	314 ppk = kr_find(pk, ID);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	315 if (ppk == NULL) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	316 return CRYPT_PK_NOT_FOUND;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	317 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	318
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	319 if (ppk->key_type == PK_PUBLIC && key_type != PK_PUBLIC) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	320 return CRYPT_PK_NOT_PRIVATE;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	321 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	322
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	323 /* this makes PK_PRIVATE an alias for PK_PRIVATE_OPTIMIZED type */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	324 if (ppk->key_type == PK_PRIVATE_OPTIMIZED && key_type == PK_PRIVATE) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	325 key_type = PK_PRIVATE_OPTIMIZED;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	326 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	327
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	328 /* now copy the header and various other details */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	329 memcpy(buf, key_magic, 4); /* magic info */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	330 buf[4] = key_type; /* key type */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	331 buf[5] = ppk->system; /* system */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	332 STORE32L(ppk->ID, buf+6); /* key ID */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	333 memcpy(buf+10, ppk->name, MAXLEN); /* the name */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	334 memcpy(buf+10+MAXLEN, ppk->email, MAXLEN); /* the email */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	335 memcpy(buf+10+MAXLEN+MAXLEN, ppk->description, MAXLEN); /* the description */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	336
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	337 /* export key */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	338 len = sizeof(buf) - (6 + 4 + MAXLEN*3);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	339 obuf = buf+6+4+MAXLEN*3;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	340 switch (ppk->system) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	341 case RSA_KEY:
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	342 if ((err = rsa_export(obuf, &len, key_type, &(ppk->key.rsa))) != CRYPT_OK) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	343 return err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	344 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	345 break;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	346 case DH_KEY:
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	347 if ((err = dh_export(obuf, &len, key_type, &(ppk->key.dh))) != CRYPT_OK) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	348 return err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	349 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	350 break;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	351 case ECC_KEY:
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	352 if ((err = ecc_export(obuf, &len, key_type, &(ppk->key.ecc))) != CRYPT_OK) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	353 return err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	354 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	355 break;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	356 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	357
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	358 /* get the entire length of the packet */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	359 len += 6 + 4 + 3*MAXLEN;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	360
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	361 if (*outlen < len) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	362 #ifdef CLEAN_STACK
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	363 zeromem(buf, sizeof(buf));
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	364 #endif
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	365 return CRYPT_BUFFER_OVERFLOW;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	366 } else {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	367 *outlen = len;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	368 memcpy(out, buf, len);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	369 #ifdef CLEAN_STACK
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	370 zeromem(buf, sizeof(buf));
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	371 #endif
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	372 return CRYPT_OK;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	373 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	374 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	375
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	376 int kr_import(pk_key pk, const unsigned char in, unsigned long inlen)
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	377 {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	378 _pk_key key;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	379 int sys, key_type, err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	380 unsigned long ID;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	381
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	382 _ARGCHK(pk != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	383 _ARGCHK(in != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	384
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	385 if (inlen < 10) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	386 return CRYPT_INVALID_PACKET;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	387 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	388
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	389 if (memcmp(in, key_magic, 4) != 0) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	390 return CRYPT_INVALID_PACKET;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	391 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	392 key_type = in[4]; /* get type */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	393 sys = in[5]; /* get system */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	394 LOAD32L(ID,in+6); /* the ID */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	395
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	396 if (ID != kr_crc(in+10, in+10+MAXLEN, in+10+MAXLEN+MAXLEN)) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	397 return CRYPT_INVALID_PACKET;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	398 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	399
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	400 zeromem(&key, sizeof(key));
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	401
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	402 /* size of remaining packet */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	403 inlen -= 10 + 3*MAXLEN;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	404
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	405 switch (sys) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	406 case RSA_KEY:
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	407 if ((err = rsa_import(in+10+3*MAXLEN, inlen, &(key.rsa))) != CRYPT_OK) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	408 return err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	409 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	410 break;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	411 case DH_KEY:
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	412 if ((err = dh_import(in+10+3*MAXLEN, inlen, &(key.dh))) != CRYPT_OK) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	413 return err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	414 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	415 break;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	416 case ECC_KEY:
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	417 if ((err = ecc_import(in+10+3*MAXLEN, inlen, &(key.ecc))) != CRYPT_OK) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	418 return err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	419 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	420 break;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	421 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	422 return kr_add(pk, key_type, sys,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	423 in+10, /* the name */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	424 in+10+MAXLEN, /* email address */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	425 in+10+MAXLEN+MAXLEN, /* description */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	426 &key);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	427 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	428
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	429
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	430 int kr_load(pk_key *pk, FILE in, symmetric_CTR *ctr)
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	431 {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	432 unsigned char buf[8192], blen[4];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	433 unsigned long len;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	434 int res, err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	435
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	436 _ARGCHK(pk != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	437 _ARGCHK(in != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	438
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	439 /* init keyring */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	440 if ((err = kr_init(pk)) != CRYPT_OK) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	441 return err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	442 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	443
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	444 /* read in magic bytes */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	445 if (_read(buf, 6, in, ctr) != 6) { goto done2; }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	446
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	447 if (memcmp(buf, file_magic, 4) != 0) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	448 return CRYPT_INVALID_PACKET;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	449 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	450
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	451 len = (unsigned long)buf[4] \| ((unsigned long)buf[5] << 8);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	452 if (len > CRYPT) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	453 return CRYPT_INVALID_PACKET;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	454 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	455
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	456 /* while there are lengths to read... */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	457 while (_read(blen, 4, in, ctr) == 4) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	458 /* get length */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	459 LOAD32L(len, blen);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	460
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	461 if (len > (unsigned long)sizeof(buf)) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	462 return CRYPT_INVALID_PACKET;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	463 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	464
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	465 if (_read(buf, len, in, ctr) != len) { goto done2; }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	466 if ((err = kr_import(*pk, buf, len)) != CRYPT_OK) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	467 return err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	468 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	469 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	470
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	471 res = CRYPT_OK;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	472 goto done;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	473 done2:
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	474 res = CRYPT_ERROR;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	475 done:
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	476 #ifdef CLEAN_STACK
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	477 zeromem(buf, sizeof(buf));
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	478 #endif
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	479 return res;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	480 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	481
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	482 int kr_save(pk_key pk, FILE out, symmetric_CTR *ctr)
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	483 {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	484 unsigned char buf[8192], blen[4];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	485 unsigned long len;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	486 int res, err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	487
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	488 _ARGCHK(pk != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	489 _ARGCHK(out != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	490
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	491 /* write out magic bytes */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	492 memcpy(buf, file_magic, 4);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	493 buf[4] = (unsigned char)(CRYPT&255);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	494 buf[5] = (unsigned char)((CRYPT>>8)&255);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	495 if (_write(buf, 6, out, ctr) != 6) { goto done2; }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	496
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	497 while (pk->system != NON_KEY) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	498 len = sizeof(buf);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	499 if ((err = kr_export(pk, pk->ID, pk->key_type, buf, &len)) != CRYPT_OK) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	500 return err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	501 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	502
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	503 STORE32L(len, blen);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	504 if (_write(blen, 4, out, ctr) != 4) { goto done2; }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	505 if (_write(buf, len, out, ctr) != len) { goto done2; }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	506
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	507 pk = pk->next;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	508 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	509
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	510 res = CRYPT_OK;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	511 goto done;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	512 done2:
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	513 res = CRYPT_ERROR;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	514 done:
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	515 #ifdef CLEAN_STACK
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	516 zeromem(buf, sizeof(buf));
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	517 #endif
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	518 return res;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	519 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	520
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	521 int kr_make_key(pk_key pk, prng_state prng, int wprng,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	522 int sys, int keysize, const unsigned char *name,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	523 const unsigned char email, const unsigned char description)
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	524 {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	525 _pk_key key;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	526 int key_type, err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	527
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	528 _ARGCHK(pk != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	529 _ARGCHK(name != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	530 _ARGCHK(email != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	531 _ARGCHK(description != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	532
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	533 /* valid PRNG? */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	534 if ((err = prng_is_valid(wprng)) != CRYPT_OK) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	535 return err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	536 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	537
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	538 /* make the key first */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	539 zeromem(&key, sizeof(key));
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	540 switch (sys) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	541 case RSA_KEY:
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	542 if ((err = rsa_make_key(prng, wprng, keysize, 65537, &(key.rsa))) != CRYPT_OK) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	543 return err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	544 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	545 key_type = key.rsa.type;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	546 break;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	547 case DH_KEY:
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	548 if ((err = dh_make_key(prng, wprng, keysize, &(key.dh))) != CRYPT_OK) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	549 return err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	550 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	551 key_type = key.dh.type;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	552 break;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	553 case ECC_KEY:
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	554 if ((err = ecc_make_key(prng, wprng, keysize, &(key.ecc))) != CRYPT_OK) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	555 return err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	556 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	557 key_type = key.ecc.type;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	558 break;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	559 default:
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	560 return CRYPT_PK_INVALID_SYSTEM;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	561 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	562
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	563 /* now add the key */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	564 if ((err = kr_add(pk, key_type, sys, name, email, description, &key)) != CRYPT_OK) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	565 return err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	566 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	567
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	568 #ifdef CLEAN_STACK
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	569 zeromem(&key, sizeof(key));
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	570 #endif
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	571 return CRYPT_OK;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	572 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	573
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	574 int kr_encrypt_key(pk_key *pk, unsigned long ID,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	575 const unsigned char *in, unsigned long inlen,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	576 unsigned char out, unsigned long outlen,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	577 prng_state *prng, int wprng, int hash)
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	578 {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	579 unsigned char buf[8192];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	580 unsigned long len;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	581 pk_key *kr;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	582 int err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	583
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	584 _ARGCHK(pk != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	585 _ARGCHK(in != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	586 _ARGCHK(out != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	587 _ARGCHK(outlen != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	588
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	589 /* find the key */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	590 kr = kr_find(pk, ID);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	591 if (kr == NULL) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	592 return CRYPT_PK_NOT_FOUND;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	593 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	594
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	595 /* store the header */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	596 memcpy(buf, enc_magic, 4);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	597
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	598 /* now store the ID */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	599 STORE32L(kr->ID,buf+4);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	600
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	601 /* now encrypt it */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	602 len = sizeof(buf)-12;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	603 switch (kr->system) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	604 case RSA_KEY:
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	605 if ((err = rsa_encrypt_key(in, inlen, buf+12, &len, prng, wprng, &(kr->key.rsa))) != CRYPT_OK) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	606 return err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	607 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	608 break;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	609 case DH_KEY:
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	610 if ((err = dh_encrypt_key(in, inlen, buf+12, &len, prng, wprng, hash, &(kr->key.dh))) != CRYPT_OK) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	611 return err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	612 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	613 break;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	614 case ECC_KEY:
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	615 if ((err = ecc_encrypt_key(in, inlen, buf+12, &len, prng, wprng, hash, &(kr->key.ecc))) != CRYPT_OK) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	616 return err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	617 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	618 break;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	619 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	620 STORE32L(len,buf+8);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	621 len += 12;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	622
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	623 if (len > *outlen) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	624 #ifdef CLEAN_STACK
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	625 zeromem(buf, sizeof(buf));
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	626 #endif
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	627 return CRYPT_BUFFER_OVERFLOW;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	628 } else {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	629 memcpy(out, buf, len);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	630 #ifdef CLEAN_STACK
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	631 zeromem(buf, sizeof(buf));
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	632 #endif
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	633 *outlen = len;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	634 return CRYPT_OK;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	635 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	636 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	637
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	638 int kr_decrypt_key(pk_key pk, const unsigned char in,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	639 unsigned char out, unsigned long outlen)
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	640 {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	641 unsigned char buf[8192];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	642 unsigned long pklen, len, ID;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	643 pk_key *kr;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	644 int err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	645
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	646 _ARGCHK(pk != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	647 _ARGCHK(in != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	648 _ARGCHK(out != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	649 _ARGCHK(outlen != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	650
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	651 /* check magic header */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	652 if (memcmp(in, enc_magic, 4)) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	653 return CRYPT_INVALID_PACKET;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	654 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	655
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	656 /* now try to find key */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	657 LOAD32L(ID,in+4);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	658 kr = kr_find(pk, ID);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	659 if (kr == NULL) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	660 return CRYPT_PK_NOT_FOUND;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	661 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	662
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	663 /* is it public? */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	664 if (kr->key_type == PK_PUBLIC) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	665 return CRYPT_PK_NOT_PRIVATE;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	666 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	667
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	668 /* now try and decrypt it */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	669 LOAD32L(pklen,in+8);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	670 len = sizeof(buf);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	671 switch (kr->system) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	672 case RSA_KEY:
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	673 if ((err = rsa_decrypt_key(in+12, pklen, buf, &len, &(kr->key.rsa))) != CRYPT_OK) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	674 return err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	675 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	676 break;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	677 case DH_KEY:
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	678 if ((err = dh_decrypt_key(in+12, pklen, buf, &len, &(kr->key.dh))) != CRYPT_OK) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	679 return err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	680 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	681 break;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	682 case ECC_KEY:
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	683 if ((err = ecc_decrypt_key(in+12, pklen, buf, &len, &(kr->key.ecc))) != CRYPT_OK) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	684 return err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	685 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	686 break;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	687 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	688
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	689 if (len > *outlen) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	690 #ifdef CLEAN_STACK
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	691 zeromem(buf, sizeof(buf));
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	692 #endif
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	693 return CRYPT_BUFFER_OVERFLOW;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	694 } else {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	695 memcpy(out, buf, len);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	696 #ifdef CLEAN_STACK
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	697 zeromem(buf, sizeof(buf));
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	698 #endif
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	699 *outlen = len;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	700 return CRYPT_OK;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	701 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	702 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	703
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	704 int kr_sign_hash(pk_key *pk, unsigned long ID,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	705 const unsigned char *in, unsigned long inlen,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	706 unsigned char out, unsigned long outlen,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	707 prng_state *prng, int wprng)
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	708 {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	709 unsigned char buf[8192];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	710 unsigned long len;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	711 pk_key *kr;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	712 int err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	713
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	714 _ARGCHK(pk != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	715 _ARGCHK(in != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	716 _ARGCHK(out != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	717 _ARGCHK(outlen != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	718
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	719 /* find the key */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	720 kr = kr_find(pk, ID);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	721 if (kr == NULL) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	722 return CRYPT_PK_NOT_FOUND;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	723 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	724
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	725 /* is it public? */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	726 if (kr->key_type == PK_PUBLIC) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	727 return CRYPT_PK_NOT_PRIVATE;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	728 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	729
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	730 /* store the header */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	731 memcpy(buf, sign_magic, 4);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	732
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	733 /* now store the ID */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	734 STORE32L(kr->ID,buf+4);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	735
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	736 /* now sign it */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	737 len = sizeof(buf)-16;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	738 switch (kr->system) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	739 case RSA_KEY:
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	740 if ((err = rsa_sign_hash(in, inlen, buf+16, &len, &(kr->key.rsa))) != CRYPT_OK) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	741 return err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	742 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	743 break;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	744 case DH_KEY:
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	745 if ((err = dh_sign_hash(in, inlen, buf+16, &len, prng, wprng, &(kr->key.dh))) != CRYPT_OK) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	746 return err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	747 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	748 break;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	749 case ECC_KEY:
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	750 if ((err = ecc_sign_hash(in, inlen, buf+16, &len, prng, wprng, &(kr->key.ecc))) != CRYPT_OK) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	751 return err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	752 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	753 break;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	754 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	755 STORE32L(inlen,buf+8);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	756 STORE32L(len,buf+12);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	757 len += 16;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	758
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	759 if (len > *outlen) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	760 #ifdef CLEAN_STACK
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	761 zeromem(buf, sizeof(buf));
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	762 #endif
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	763 return CRYPT_BUFFER_OVERFLOW;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	764 } else {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	765 memcpy(out, buf, len);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	766 #ifdef CLEAN_STACK
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	767 zeromem(buf, sizeof(buf));
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	768 #endif
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	769 *outlen = len;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	770 return CRYPT_OK;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	771 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	772 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	773
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	774 int kr_verify_hash(pk_key pk, const unsigned char in, const unsigned char *hash,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	775 unsigned long hashlen, int *stat)
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	776 {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	777 unsigned long inlen, pklen, ID;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	778 pk_key *kr;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	779 int err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	780
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	781 _ARGCHK(pk != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	782 _ARGCHK(in != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	783 _ARGCHK(hash != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	784 _ARGCHK(stat != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	785
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	786 /* default to not match */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	787 *stat = 0;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	788
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	789 /* check magic header */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	790 if (memcmp(in, sign_magic, 4)) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	791 return CRYPT_INVALID_PACKET;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	792 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	793
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	794 /* now try to find key */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	795 LOAD32L(ID,in+4);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	796 kr = kr_find(pk, ID);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	797 if (kr == NULL) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	798 return CRYPT_PK_NOT_FOUND;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	799 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	800
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	801 /* now try and verify it */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	802 LOAD32L(inlen,in+8); /* this is the length of the original inlen */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	803 LOAD32L(pklen,in+12); /* size of the PK packet */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	804 if (inlen != hashlen) { /* size doesn't match means the signature is invalid */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	805 return CRYPT_OK;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	806 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	807
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	808 switch (kr->system) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	809 case RSA_KEY:
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	810 if ((err = rsa_verify_hash(in+16, pklen, hash, stat, &(kr->key.rsa))) != CRYPT_OK) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	811 return err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	812 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	813 break;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	814 case DH_KEY:
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	815 if ((err = dh_verify_hash(in+16, pklen, hash, inlen, stat, &(kr->key.dh))) != CRYPT_OK) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	816 return err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	817 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	818 break;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	819 case ECC_KEY:
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	820 if ((err = ecc_verify_hash(in+16, pklen, hash, inlen, stat, &(kr->key.ecc))) != CRYPT_OK) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	821 return err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	822 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	823 break;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	824 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	825 return CRYPT_OK;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	826 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	827
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	828 int kr_fingerprint(pk_key *pk, unsigned long ID, int hash,
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	829 unsigned char out, unsigned long outlen)
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	830 {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	831 unsigned char buf[8192];
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	832 unsigned long len;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	833 int err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	834
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	835 _ARGCHK(pk != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	836 _ARGCHK(out != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	837 _ARGCHK(outlen != NULL);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	838
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	839 /* valid hash? */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	840 if ((err = hash_is_valid(hash)) != CRYPT_OK) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	841 return err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	842 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	843
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	844 len = (unsigned long)sizeof(buf);
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	845 if ((err = kr_export(pk, ID, PK_PUBLIC, buf, &len)) != CRYPT_OK) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	846 return err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	847 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	848
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	849 /* now hash it */
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	850 if ((err = hash_memory(hash, buf, len, out, outlen)) != CRYPT_OK) {
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	851 return err;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	852 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	853
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	854 #ifdef CLEAN_STACK
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	855 zeromem(buf, sizeof(buf));
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	856 #endif
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	857 return CRYPT_OK;
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	858 }
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	859
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	860 #endif
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	861
d7da3b1e1540 put back the 0.95 makefile which was inadvertently merged over Matt Johnston <matt@ucc.asn.au> parents: diff changeset	862

Mercurial > dropbear

annotate keyring.c @ 138:b1edc9158f6c libtomcrypt