mirror of
https://github.com/openbsd/src.git
synced 2024-12-22 16:42:56 -08:00
move crypto code
This commit is contained in:
deraadt
parent
37976c7fd8
commit
21f2d90fe9
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: files,v 1.151 2000/02/07 00:33:03 niklas Exp $
|
||||
# $OpenBSD: files,v 1.152 2000/02/28 23:13:06 deraadt Exp $
|
||||
# $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $
|
||||
|
||||
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
|
||||
@ -506,14 +506,14 @@ file netinet/ipsec_input.c (inet | inet6) & ipsec
|
||||
file netinet/ip_xform.c inet & ipsec
|
||||
file netinet/ip_esp.c inet & ipsec
|
||||
file netinet/ip_ah.c inet & ipsec
|
||||
file netinet/ip_rmd160.c inet & ipsec
|
||||
file netinet/ip_sha1.c inet & ipsec
|
||||
file netinet/ip_blf.c (inet & ipsec) | uvm_swap_encrypt
|
||||
file netinet/ip_cast.c inet & ipsec
|
||||
file netinet/ip_skipjack.c inet & ipsec
|
||||
file netinet/libdeslite/ecb_enc.c inet & ipsec
|
||||
file netinet/libdeslite/set_key.c inet & ipsec
|
||||
file netinet/libdeslite/ecb3_enc.c inet & ipsec
|
||||
file crypto/rmd160.c (inet & ipsec) | crypto
|
||||
file crypto/sha1.c (inet & ipsec) | crypto
|
||||
file crypto/blf.c (inet & ipsec) | crypto | uvm_swap_encrypt
|
||||
file crypto/cast.c (inet & ipsec) | crypto
|
||||
file crypto/skipjack.c (inet & ipsec) | crypto
|
||||
file crypto/ecb_enc.c (inet & ipsec) | crypto
|
||||
file crypto/set_key.c (inet & ipsec) | crypto
|
||||
file crypto/ecb3_enc.c (inet & ipsec) | crypto
|
||||
file netatalk/aarp.c netatalk
|
||||
file netatalk/at_control.c netatalk
|
||||
file netatalk/at_proto.c netatalk
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: ip_blf.c,v 1.6 1999/12/28 13:09:13 provos Exp $ */
|
||||
/* $OpenBSD: blf.c,v 1.1 2000/02/28 23:13:04 deraadt Exp $ */
|
||||
/*
|
||||
* Blowfish block cipher for OpenBSD
|
||||
* Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
|
||||
@ -42,7 +42,7 @@
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
||||
#include <netinet/ip_blf.h>
|
||||
#include <crypto/blf.h>
|
||||
|
||||
#undef inline
|
||||
#ifdef __GNUC__
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: ip_blf.h,v 1.3 1999/12/28 13:09:13 provos Exp $ */
|
||||
/* $OpenBSD: blf.h,v 1.1 2000/02/28 23:13:04 deraadt Exp $ */
|
||||
/*
|
||||
* Blowfish - a fast block cipher designed by Bruce Schneier
|
||||
*
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: ip_cast.c,v 1.3 1999/02/17 18:09:55 deraadt Exp $ */
|
||||
/* $OpenBSD: cast.c,v 1.1 2000/02/28 23:13:04 deraadt Exp $ */
|
||||
/*
|
||||
* CAST-128 in C
|
||||
* Written by Steve Reid <sreid@sea-to-sky.net>
|
||||
@ -7,8 +7,8 @@
|
||||
*/
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <netinet/ip_cast.h>
|
||||
#include <netinet/ip_castsb.h>
|
||||
#include <crypto/cast.h>
|
||||
#include <crypto/castsb.h>
|
||||
|
||||
/* Macros to access 8-bit bytes out of a 32-bit word */
|
||||
#define U_INT8_Ta(x) ( (u_int8_t) (x>>24) )
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: ip_cast.h,v 1.3 1999/02/17 18:09:55 deraadt Exp $ */
|
||||
/* $OpenBSD: cast.h,v 1.1 2000/02/28 23:13:04 deraadt Exp $ */
|
||||
|
||||
/*
|
||||
* CAST-128 in C
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: ip_castsb.h,v 1.2 1999/02/17 18:09:55 deraadt Exp $ */
|
||||
/* $OpenBSD: castsb.h,v 1.1 2000/02/28 23:13:04 deraadt Exp $ */
|
||||
/*
|
||||
* CAST-128 in C
|
||||
* Written by Steve Reid <sreid@sea-to-sky.net>
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: des.h,v 1.3 1997/02/24 14:06:51 niklas Exp $ */
|
||||
/* $OpenBSD: des.h,v 1.1 2000/02/28 23:13:04 deraadt Exp $ */
|
||||
|
||||
/* lib/des/des.h */
|
||||
/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au)
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: des_locl.h,v 1.3 1997/02/24 14:06:51 niklas Exp $ */
|
||||
/* $OpenBSD: des_locl.h,v 1.1 2000/02/28 23:13:04 deraadt Exp $ */
|
||||
|
||||
/* lib/des/des_locl.h */
|
||||
/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au)
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: ecb3_enc.c,v 1.2 1997/11/07 08:27:28 niklas Exp $ */
|
||||
/* $OpenBSD: ecb3_enc.c,v 1.1 2000/02/28 23:13:04 deraadt Exp $ */
|
||||
|
||||
/* lib/des/ecb3_enc.c */
|
||||
/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au)
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: ecb_enc.c,v 1.2 1997/02/24 14:06:52 niklas Exp $ */
|
||||
/* $OpenBSD: ecb_enc.c,v 1.1 2000/02/28 23:13:05 deraadt Exp $ */
|
||||
|
||||
/* lib/des/ecb_enc.c */
|
||||
/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au)
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: podd.h,v 1.2 1997/02/24 14:06:52 niklas Exp $ */
|
||||
/* $OpenBSD: podd.h,v 1.1 2000/02/28 23:13:05 deraadt Exp $ */
|
||||
|
||||
/* lib/des/podd.h */
|
||||
/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au)
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: ip_rmd160.c,v 1.5 1998/09/09 22:34:28 janjaap Exp $ */
|
||||
/* $OpenBSD: rmd160.c,v 1.1 2000/02/28 23:13:05 deraadt Exp $ */
|
||||
/********************************************************************\
|
||||
*
|
||||
* FILE: rmd160.c
|
||||
@ -21,7 +21,7 @@
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
||||
#include <netinet/ip_rmd160.h>
|
||||
#include <crypto/rmd160.h>
|
||||
|
||||
/********************************************************************/
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: ip_rmd160.h,v 1.3 1999/02/17 18:10:08 deraadt Exp $ */
|
||||
/* $OpenBSD: rmd160.h,v 1.1 2000/02/28 23:13:05 deraadt Exp $ */
|
||||
|
||||
/*
|
||||
* FILE: rmd160.h
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: set_key.c,v 1.4 1999/02/19 00:48:20 art Exp $ */
|
||||
/* $OpenBSD: set_key.c,v 1.1 2000/02/28 23:13:05 deraadt Exp $ */
|
||||
|
||||
/* lib/des/set_key.c */
|
||||
/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au)
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: ip_sha1.c,v 1.7 1999/02/17 18:10:23 deraadt Exp $ */
|
||||
/* $OpenBSD: sha1.c,v 1.1 2000/02/28 23:13:05 deraadt Exp $ */
|
||||
|
||||
/*
|
||||
* SHA-1 in C
|
||||
@ -22,7 +22,7 @@
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
||||
#include <netinet/ip_sha1.h>
|
||||
#include <crypto/sha1.h>
|
||||
|
||||
#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: ip_sha1.h,v 1.5 1999/02/17 18:10:24 deraadt Exp $ */
|
||||
/* $OpenBSD: sha1.h,v 1.1 2000/02/28 23:13:05 deraadt Exp $ */
|
||||
|
||||
/*
|
||||
* SHA-1 in C
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: sk.h,v 1.2 1997/02/24 14:06:53 niklas Exp $ */
|
||||
/* $OpenBSD: sk.h,v 1.1 2000/02/28 23:13:05 deraadt Exp $ */
|
||||
|
||||
/* lib/des/sk.h */
|
||||
/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au)
|
||||
@ -12,7 +12,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <netinet/ip_skipjack.h>
|
||||
#include <crypto/skipjack.h>
|
||||
#include <sys/malloc.h>
|
||||
|
||||
static const u_int8_t ftable[0x100] =
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: spr.h,v 1.2 1997/02/24 14:06:54 niklas Exp $ */
|
||||
/* $OpenBSD: spr.h,v 1.1 2000/02/28 23:13:05 deraadt Exp $ */
|
||||
|
||||
/* lib/des/spr.h */
|
||||
/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au)
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: ip_ipsp.h,v 1.60 2000/01/27 08:09:12 angelos Exp $ */
|
||||
/* $OpenBSD: ip_ipsp.h,v 1.61 2000/02/28 23:13:07 deraadt Exp $ */
|
||||
|
||||
/*
|
||||
* The authors of this code are John Ioannidis (ji@tla.org),
|
||||
@ -48,11 +48,11 @@
|
||||
#include <sys/queue.h>
|
||||
#include <netinet/in.h>
|
||||
#include <sys/md5k.h>
|
||||
#include <netinet/ip_sha1.h>
|
||||
#include <netinet/ip_rmd160.h>
|
||||
#include <netinet/ip_blf.h>
|
||||
#include <netinet/ip_cast.h>
|
||||
#include <netinet/ip_skipjack.h>
|
||||
#include <crypto/sha1.h>
|
||||
#include <crypto/rmd160.h>
|
||||
#include <crypto/blf.h>
|
||||
#include <crypto/cast.h>
|
||||
#include <crypto/skipjack.h>
|
||||
|
||||
union sockaddr_union
|
||||
{
|
||||
|
||||
@ -1,40 +0,0 @@
|
||||
# $OpenBSD: Makefile,v 1.2 1997/02/24 14:06:50 niklas Exp $
|
||||
|
||||
#
|
||||
# This is the "lite" portion of libdes -- just the routines needed
|
||||
# to do CBC DES and 3DES for IPSP.
|
||||
#
|
||||
#
|
||||
# Pruning by John Ioannidis, <ji@tla.org>
|
||||
#
|
||||
|
||||
# This #define specifies the use of an alternative D_ENCRYPT macro in
|
||||
# ecb_encrypt. The choice of macro can make a %20 difference in the
|
||||
# speed. Unfortunatly the choise of the best macro appears to be very
|
||||
# dependant on the compiler and the machine in question.
|
||||
# For the following combinations use the ALT_ECB option.
|
||||
# Sparc 2 (cc -O4), sun 3/260 (cc -O4)
|
||||
# For the following combinations do not use the ALT_ECB option.
|
||||
# Sparc 2 (gcc2 -O2), sun 3/260 (cc -O2), mvax2 (cc -O), MSDOS (Turbo Cv2)
|
||||
# For other machines, experiment with changing the option and run
|
||||
# ./speed to see which is faster.
|
||||
# DO NOT TURN THIS OPTION ON WHEN COMPILING THIS CODE ON A 64 BIT MACHINE
|
||||
#OPTS2= -DDES_USE_PTR
|
||||
|
||||
OPTS= $(OPTS0) $(OPTS1) $(OPTS2)
|
||||
|
||||
#CC=cc
|
||||
#CFLAGS= -O $(OPTS) $(CFLAG)
|
||||
|
||||
CC=gcc
|
||||
CFLAGS= -O3 -fomit-frame-pointer $(OPTS) $(CFLAG)
|
||||
|
||||
OBJS= cbc3_enc.o cbc_enc.o ecb_enc.o set_key.o
|
||||
|
||||
modules: libdeslite.o
|
||||
|
||||
libdeslite.o: $(OBJS)
|
||||
ld -x -r -o libdeslite.o $(OBJS)
|
||||
clean:
|
||||
@rm -f *.o
|
||||
# DO NOT DELETE THIS LINE -- make depend depends on it.
|
||||
Loading…
Reference in New Issue
Block a user