diff options
author | markm <markm@FreeBSD.org> | 1996-07-28 08:23:19 +0000 |
---|---|---|
committer | markm <markm@FreeBSD.org> | 1996-07-28 08:23:19 +0000 |
commit | fe9c66faf4f31f3e9fb219badc7e50f9025e3dbd (patch) | |
tree | 4c8e59f43d99196d002226fbac748ae795b21f22 /secure/lib | |
parent | ac895ecc7b28577d3762c5eb9a832b45702c3302 (diff) | |
download | FreeBSD-src-fe9c66faf4f31f3e9fb219badc7e50f9025e3dbd.zip FreeBSD-src-fe9c66faf4f31f3e9fb219badc7e50f9025e3dbd.tar.gz |
Mrege conflicts etc.
Diffstat (limited to 'secure/lib')
-rw-r--r-- | secure/lib/libdes/des.h | 47 | ||||
-rw-r--r-- | secure/lib/libdes/new_rkey.c | 8 | ||||
-rw-r--r-- | secure/lib/libdes/version.h | 48 |
3 files changed, 42 insertions, 61 deletions
diff --git a/secure/lib/libdes/des.h b/secure/lib/libdes/des.h index 80b293b..203afda 100644 --- a/secure/lib/libdes/des.h +++ b/secure/lib/libdes/des.h @@ -1,5 +1,5 @@ /* lib/des/des.h */ -/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) +/* Copyright (C) 1995-1996 Eric Young (eay@mincom.oz.au) * All rights reserved. * * This file is part of an SSL implementation written @@ -48,10 +48,30 @@ #ifndef HEADER_DES_H #define HEADER_DES_H +#ifdef __cplusplus +extern "C" { +#endif + #include <stdio.h> +/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a + * %20 speed up (longs are 8 bytes, int's are 4). */ +#ifndef DES_LONG +#define DES_LONG unsigned long +#endif + typedef unsigned char des_cblock[8]; -typedef struct des_ks_struct { des_cblock _; } des_key_schedule[16]; +typedef struct des_ks_struct + { + union { + des_cblock _; + /* make sure things are correct size on machines with + * 8 byte longs */ + DES_LONG pad[2]; + } ks; +#undef _ +#define _ ks._ + } des_key_schedule[16]; #define DES_KEY_SZ (sizeof(des_cblock)) #define DES_SCHEDULE_SZ (sizeof(des_key_schedule)) @@ -76,8 +96,10 @@ typedef struct des_ks_struct { des_cblock _; } des_key_schedule[16]; #define C_Block des_cblock #define Key_schedule des_key_schedule +#ifdef KERBEROS #define ENCRYPT DES_ENCRYPT #define DECRYPT DES_DECRYPT +#endif #define KEY_SZ DES_KEY_SZ #define string_to_key des_string_to_key #define read_pw_string des_read_pw_string @@ -92,7 +114,7 @@ typedef struct des_ks_struct { des_cblock _; } des_key_schedule[16]; #define quad_cksum des_quad_cksum /* For compatibility with the MIT lib - eay 20/05/92 */ -typedef struct des_key_schedule bit_64; +typedef des_key_schedule bit_64; #define des_fixup_key_parity des_set_odd_parity #define des_check_key_parity check_parity @@ -106,10 +128,11 @@ extern int des_rw_mode; /* defaults to DES_PCBC_MODE */ #undef NOPROTO #endif #ifndef NOPROTO +char *des_options(void); void des_ecb3_encrypt(des_cblock *input,des_cblock *output, des_key_schedule ks1,des_key_schedule ks2, des_key_schedule ks3, int enc); -unsigned long des_cbc_cksum(des_cblock *input,des_cblock *output, +DES_LONG des_cbc_cksum(des_cblock *input,des_cblock *output, long length,des_key_schedule schedule,des_cblock *ivec); void des_cbc_encrypt(des_cblock *input,des_cblock *output,long length, des_key_schedule schedule,des_cblock *ivec,int enc); @@ -122,8 +145,8 @@ void des_cfb_encrypt(unsigned char *in,unsigned char *out,int numbits, long length,des_key_schedule schedule,des_cblock *ivec,int enc); void des_ecb_encrypt(des_cblock *input,des_cblock *output, des_key_schedule ks,int enc); -void des_encrypt(unsigned long *data,des_key_schedule ks, int enc); -void des_encrypt2(unsigned long *data,des_key_schedule ks, int enc); +void des_encrypt(DES_LONG *data,des_key_schedule ks, int enc); +void des_encrypt2(DES_LONG *data,des_key_schedule ks, int enc); void des_ede3_cbc_encrypt(des_cblock *input, des_cblock *output, long length, des_key_schedule ks1, des_key_schedule ks2, des_key_schedule ks3, des_cblock *ivec, int enc); @@ -155,7 +178,7 @@ void des_ofb_encrypt(unsigned char *in,unsigned char *out, int numbits,long length,des_key_schedule schedule,des_cblock *ivec); void des_pcbc_encrypt(des_cblock *input,des_cblock *output,long length, des_key_schedule schedule,des_cblock *ivec,int enc); -unsigned long des_quad_cksum(des_cblock *input,des_cblock *output, +DES_LONG des_quad_cksum(des_cblock *input,des_cblock *output, long length,int out_count,des_cblock *seed); void des_random_seed(des_cblock key); void des_random_key(des_cblock ret); @@ -187,8 +210,9 @@ void des_generate_random_block(des_cblock *block); #else +char *des_options(); void des_ecb3_encrypt(); -unsigned long des_cbc_cksum(); +DES_LONG des_cbc_cksum(); void des_cbc_encrypt(); void des_ncbc_encrypt(); void des_3cbc_encrypt(); @@ -210,7 +234,7 @@ char *crypt(); #endif void des_ofb_encrypt(); void des_pcbc_encrypt(); -unsigned long des_quad_cksum(); +DES_LONG des_quad_cksum(); void des_random_seed(); void des_random_key(); int des_read_password(); @@ -237,4 +261,9 @@ void des_set_sequence_number(); void des_generate_random_block(); #endif + +#ifdef __cplusplus +} +#endif + #endif diff --git a/secure/lib/libdes/new_rkey.c b/secure/lib/libdes/new_rkey.c index d15e02a..aa4ecfe 100644 --- a/secure/lib/libdes/new_rkey.c +++ b/secure/lib/libdes/new_rkey.c @@ -1,5 +1,5 @@ -/* lib/des/new_rkey.c */ -/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) +/* crypto/des/new_rkey.c */ +/* Copyright (C) 1995-1996 Eric Young (eay@mincom.oz.au) * All rights reserved. * * This file is part of an SSL implementation written @@ -77,7 +77,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: new_rkey.c,v 1.2 1996/02/10 15:54:48 markm Exp $ + * $Id: new_rkey.c,v 1.1.1.2 1996/07/28 08:17:26 markm Exp $ */ /* 21-Nov-95 - eay - I've finally put this into libdes, I have made a @@ -96,7 +96,7 @@ /* This counter keeps track of the pseudo-random sequence */ static union { - unsigned long ul0, ul1; + DES_LONG ul0, ul1; unsigned char uc[8]; } counter; diff --git a/secure/lib/libdes/version.h b/secure/lib/libdes/version.h deleted file mode 100644 index aee1190..0000000 --- a/secure/lib/libdes/version.h +++ /dev/null @@ -1,48 +0,0 @@ -/* lib/des/version.h */ -/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) - * All rights reserved. - * - * This file is part of an SSL implementation written - * by Eric Young (eay@mincom.oz.au). - * The implementation was written so as to conform with Netscapes SSL - * specification. This library and applications are - * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE - * as long as the following conditions are aheared to. - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. If this code is used in a product, - * Eric Young should be given attribution as the author of the parts used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Eric Young (eay@mincom.oz.au) - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -extern char *DES_version; |