head	1.13;
access;
symbols
	perseant-exfatfs-base-20250801:1.13
	perseant-exfatfs-base-20240630:1.13
	perseant-exfatfs:1.13.0.22
	perseant-exfatfs-base:1.13
	cjep_sun2x:1.13.0.20
	cjep_sun2x-base:1.13
	cjep_staticlib_x-base1:1.13
	cjep_staticlib_x:1.13.0.18
	cjep_staticlib_x-base:1.13
	phil-wifi-20200421:1.13
	phil-wifi-20200411:1.13
	phil-wifi-20200406:1.13
	pgoyette-compat-merge-20190127:1.13
	pgoyette-compat-20190127:1.13
	pgoyette-compat-20190118:1.13
	pgoyette-compat-1226:1.13
	pgoyette-compat-1126:1.13
	pgoyette-compat-1020:1.13
	pgoyette-compat-0930:1.13
	pgoyette-compat-0906:1.13
	pgoyette-compat-0728:1.13
	pgoyette-compat-0625:1.13
	pgoyette-compat-0521:1.13
	pgoyette-compat-0502:1.13
	pgoyette-compat-0422:1.13
	pgoyette-compat-0415:1.13
	pgoyette-compat-0407:1.13
	pgoyette-compat-0330:1.13
	pgoyette-compat-0322:1.13
	pgoyette-compat-0315:1.13
	pgoyette-compat:1.13.0.16
	pgoyette-compat-base:1.13
	prg-localcount2-base3:1.13
	prg-localcount2-base2:1.13
	prg-localcount2-base1:1.13
	prg-localcount2:1.13.0.14
	prg-localcount2-base:1.13
	pgoyette-localcount-20170426:1.13
	bouyer-socketcan-base1:1.13
	pgoyette-localcount-20170320:1.13
	bouyer-socketcan:1.13.0.12
	bouyer-socketcan-base:1.13
	pgoyette-localcount-20170107:1.13
	pgoyette-localcount-20161104:1.13
	localcount-20160914:1.13
	pgoyette-localcount-20160806:1.13
	pgoyette-localcount-20160726:1.13
	pgoyette-localcount:1.13.0.10
	pgoyette-localcount-base:1.13
	netbsd-5-2-3-RELEASE:1.12
	netbsd-5-1-5-RELEASE:1.12
	yamt-pagecache-base9:1.13
	yamt-pagecache-tag8:1.13
	tls-earlyentropy:1.13.0.6
	tls-earlyentropy-base:1.13
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.13
	riastradh-drm2-base3:1.13
	netbsd-5-2-2-RELEASE:1.12
	netbsd-5-1-4-RELEASE:1.12
	netbsd-5-2-1-RELEASE:1.12
	netbsd-5-1-3-RELEASE:1.12
	agc-symver:1.13.0.8
	agc-symver-base:1.13
	tls-maxphys-base:1.13
	yamt-pagecache-base8:1.13
	netbsd-5-2:1.12.0.2
	yamt-pagecache-base7:1.13
	netbsd-5-2-RELEASE:1.12
	netbsd-5-2-RC1:1.12
	yamt-pagecache-base6:1.13
	yamt-pagecache-base5:1.13
	yamt-pagecache-base4:1.13
	netbsd-5-1-2-RELEASE:1.12
	netbsd-5-1-1-RELEASE:1.12
	yamt-pagecache-base3:1.13
	yamt-pagecache-base2:1.13
	yamt-pagecache:1.13.0.4
	yamt-pagecache-base:1.13
	bouyer-quota2-nbase:1.13
	bouyer-quota2:1.13.0.2
	bouyer-quota2-base:1.13
	matt-nb5-mips64-premerge-20101231:1.12
	matt-nb5-pq3:1.12.0.14
	matt-nb5-pq3-base:1.12
	netbsd-5-1:1.12.0.12
	netbsd-5-1-RELEASE:1.12
	netbsd-5-1-RC4:1.12
	matt-nb5-mips64-k15:1.12
	netbsd-5-1-RC3:1.12
	netbsd-5-1-RC2:1.12
	netbsd-5-1-RC1:1.12
	netbsd-5-0-2-RELEASE:1.12
	matt-nb5-mips64-premerge-20091211:1.12
	matt-nb5-mips64-u2-k2-k4-k7-k8-k9:1.12
	matt-nb4-mips64-k7-u2a-k9b:1.12
	matt-nb5-mips64-u1-k1-k5:1.12
	matt-nb5-mips64:1.12.0.10
	netbsd-5-0-1-RELEASE:1.12
	jym-xensuspend-nbase:1.12
	netbsd-5-0:1.12.0.8
	netbsd-5-0-RELEASE:1.12
	netbsd-5-0-RC4:1.12
	netbsd-5-0-RC3:1.12
	netbsd-5-0-RC2:1.12
	jym-xensuspend:1.12.0.6
	jym-xensuspend-base:1.12
	netbsd-5-0-RC1:1.12
	netbsd-5:1.12.0.4
	netbsd-5-base:1.12
	matt-mips64-base2:1.12
	matt-mips64:1.10.0.14
	netbsd-4-0-1-RELEASE:1.10
	wrstuden-revivesa-base-3:1.12
	wrstuden-revivesa-base-2:1.12
	wrstuden-fixsa-newbase:1.10
	wrstuden-revivesa-base-1:1.12
	yamt-pf42-base4:1.12
	yamt-pf42-base3:1.12
	hpcarm-cleanup-nbase:1.12
	yamt-pf42-baseX:1.11
	yamt-pf42-base2:1.12
	wrstuden-revivesa:1.11.0.8
	wrstuden-revivesa-base:1.12
	yamt-pf42:1.11.0.6
	yamt-pf42-base:1.11
	keiichi-mipv6:1.11.0.4
	keiichi-mipv6-base:1.11
	matt-armv6-nbase:1.11
	matt-armv6-prevmlocking:1.10
	wrstuden-fixsa-base-1:1.10
	netbsd-4-0:1.10.0.12
	netbsd-4-0-RELEASE:1.10
	cube-autoconf:1.11.0.2
	cube-autoconf-base:1.11
	netbsd-4-0-RC5:1.10
	netbsd-4-0-RC4:1.10
	netbsd-4-0-RC3:1.10
	netbsd-4-0-RC2:1.10
	netbsd-4-0-RC1:1.10
	matt-armv6:1.10.0.10
	matt-armv6-base:1.11
	matt-mips64-base:1.10
	hpcarm-cleanup:1.10.0.8
	hpcarm-cleanup-base:1.11
	netbsd-3-1-1-RELEASE:1.9
	netbsd-3-0-3-RELEASE:1.9
	wrstuden-fixsa:1.10.0.6
	wrstuden-fixsa-base:1.10
	abandoned-netbsd-4-base:1.10
	abandoned-netbsd-4:1.10.0.2
	netbsd-3-1:1.9.0.12
	netbsd-3-1-RELEASE:1.9
	netbsd-3-0-2-RELEASE:1.9
	netbsd-3-1-RC4:1.9
	netbsd-3-1-RC3:1.9
	netbsd-3-1-RC2:1.9
	netbsd-3-1-RC1:1.9
	netbsd-4:1.10.0.4
	netbsd-4-base:1.10
	netbsd-3-0-1-RELEASE:1.9
	netbsd-3-0:1.9.0.10
	netbsd-3-0-RELEASE:1.9
	netbsd-3-0-RC6:1.9
	netbsd-3-0-RC5:1.9
	netbsd-3-0-RC4:1.9
	netbsd-3-0-RC3:1.9
	netbsd-3-0-RC2:1.9
	netbsd-3-0-RC1:1.9
	netbsd-2-0-3-RELEASE:1.9
	netbsd-2-1:1.9.0.8
	netbsd-2-1-RELEASE:1.9
	netbsd-2-1-RC6:1.9
	netbsd-2-1-RC5:1.9
	netbsd-2-1-RC4:1.9
	netbsd-2-1-RC3:1.9
	netbsd-2-1-RC2:1.9
	netbsd-2-1-RC1:1.9
	netbsd-2-0-2-RELEASE:1.9
	netbsd-3:1.9.0.6
	netbsd-3-base:1.9
	netbsd-2-0-1-RELEASE:1.9
	netbsd-2:1.9.0.4
	netbsd-2-base:1.9
	netbsd-2-0-RELEASE:1.9
	netbsd-2-0-RC5:1.9
	netbsd-2-0-RC4:1.9
	netbsd-2-0-RC3:1.9
	netbsd-2-0-RC2:1.9
	netbsd-2-0-RC1:1.9
	netbsd-2-0:1.9.0.2
	netbsd-2-0-base:1.9
	netbsd-1-6-PATCH002-RELEASE:1.8
	netbsd-1-6-PATCH002:1.8
	netbsd-1-6-PATCH002-RC4:1.8
	netbsd-1-6-PATCH002-RC3:1.8
	netbsd-1-6-PATCH002-RC2:1.8
	netbsd-1-6-PATCH002-RC1:1.8
	netbsd-1-6-PATCH001:1.8
	netbsd-1-6-PATCH001-RELEASE:1.8
	netbsd-1-6-PATCH001-RC3:1.8
	netbsd-1-6-PATCH001-RC2:1.8
	netbsd-1-6-PATCH001-RC1:1.8
	fvdl_fs64_base:1.8
	netbsd-1-6-RELEASE:1.8
	netbsd-1-6-RC3:1.8
	netbsd-1-6-RC2:1.8
	netbsd-1-6-RC1:1.8
	netbsd-1-6:1.8.0.2
	netbsd-1-6-base:1.8
	netbsd-1-5-PATCH003:1.1.1.1.2.2
	netbsd-1-5-PATCH002:1.1.1.1.2.2
	netbsd-1-5-PATCH001:1.1.1.1.2.2
	netbsd-1-5-RELEASE:1.1.1.1.2.2
	netbsd-1-5-BETA2:1.1.1.1.2.2
	netbsd-1-5-BETA:1.1.1.1.2.2
	netbsd-1-5-ALPHA2:1.1.1.1.2.2
	minoura-xpg4dl:1.2.0.2
	netbsd-1-5:1.1.1.1.0.2
	netbsd-1-5-base:1.1.1.1
	cryptosrc-intl-20000615:1.1.1.1
	netbsd-cryptosrc-intl:1.1.1;
locks; strict;
comment	@# @;


1.13
date	2009.07.19.23.35.03;	author christos;	state dead;
branches;
next	1.12;

1.12
date	2008.05.10.21.30.06;	author christos;	state Exp;
branches;
next	1.11;

1.11
date	2007.12.09.22.44.15;	author adrianp;	state Exp;
branches
	1.11.6.1
	1.11.8.1;
next	1.10;

1.10
date	2006.03.17.20.47.45;	author dsl;	state Exp;
branches
	1.10.10.1;
next	1.9;

1.9
date	2003.07.24.14.16.32;	author itojun;	state Exp;
branches;
next	1.8;

1.8
date	2001.09.10.02.56.57;	author thorpej;	state Exp;
branches;
next	1.7;

1.7
date	2001.09.09.21.22.09;	author tls;	state Exp;
branches;
next	1.6;

1.6
date	2001.09.09.20.54.25;	author tls;	state Exp;
branches;
next	1.5;

1.5
date	2001.09.09.20.41.47;	author tls;	state Exp;
branches;
next	1.4;

1.4
date	2001.04.12.07.48.04;	author itojun;	state Exp;
branches;
next	1.3;

1.3
date	2000.07.16.07.16.22;	author mrg;	state Exp;
branches;
next	1.2;

1.2
date	2000.06.21.19.34.24;	author thorpej;	state Exp;
branches
	1.2.2.1;
next	1.1;

1.1
date	2000.06.16.04.21.32;	author thorpej;	state Exp;
branches
	1.1.1.1;
next	;

1.11.6.1
date	2008.05.18.12.30.21;	author yamt;	state Exp;
branches;
next	;

1.11.8.1
date	2008.06.23.04.29.36;	author wrstuden;	state Exp;
branches;
next	;

1.10.10.1
date	2008.01.09.01.34.30;	author matt;	state Exp;
branches;
next	;

1.2.2.1
date	2000.06.21.19.34.24;	author minoura;	state dead;
branches;
next	1.2.2.2;

1.2.2.2
date	2000.06.23.16.16.22;	author minoura;	state Exp;
branches;
next	;

1.1.1.1
date	2000.06.16.04.21.32;	author thorpej;	state Exp;
branches
	1.1.1.1.2.1;
next	;

1.1.1.1.2.1
date	2000.06.22.06.55.04;	author thorpej;	state Exp;
branches;
next	1.1.1.1.2.2;

1.1.1.1.2.2
date	2000.07.17.05.59.58;	author mrg;	state Exp;
branches;
next	1.1.1.1.2.3;

1.1.1.1.2.3
date	2002.08.29.16.39.02;	author he;	state Exp;
branches;
next	;


desc
@@


1.13
log
@OpenSSL moved to crypto/external
@
text
@#	$NetBSD: des.inc,v 1.12 2008/05/10 21:30:06 christos Exp $
#
#	@@(#) Copyright (c) 1995 Simon J. Gerraty
#
#	SRCS extracted from src/crypto/dist/openssl/crypto/des/Makefile
#

.PATH:	${OPENSSLSRC}/crypto/des

.if !defined(DES_SRCS)
DES_SRCS = des_enc.c fcrypt_b.c
.endif
DES_SRCS += cbc_cksm.c cbc_enc.c  cfb64enc.c cfb_enc.c  \
	ecb3_enc.c ecb_enc.c  enc_read.c enc_writ.c \
	fcrypt.c ofb64enc.c ofb_enc.c  pcbc_enc.c \
	qud_cksm.c rand_key.c rpc_enc.c  set_key.c  \
	xcbc_enc.c \
	str2key.c  cfb64ede.c ofb64ede.c ede_cbcm_enc.c \
	read2pwd.c
#	des_old.c des_old2.c 
SRCS += ${DES_SRCS}

.for cryptosrc in ${DES_SRCS}
CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/des
.endfor
@


1.12
log
@Accommodate more assembly builds.
@
text
@d1 1
a1 1
#	$NetBSD: des.inc,v 1.11 2007/12/09 22:44:15 adrianp Exp $
@


1.11
log
@Cosmetic path changes just clarifying where we actually get the contents
of these files from.
@
text
@d1 1
a1 1
#	$NetBSD: des.inc,v 1.10 2006/03/17 20:47:45 dsl Exp $
d10 4
a13 2

DES_SRCS = cbc_cksm.c cbc_enc.c  cfb64enc.c cfb_enc.c  \
a16 1
	des_enc.c fcrypt_b.c \
@


1.11.8.1
log
@Sync w/ -current. 34 merge conflicts to follow.
@
text
@d1 1
a1 1
#	$NetBSD: des.inc,v 1.11 2007/12/09 22:44:15 adrianp Exp $
d10 2
a11 4
.if !defined(DES_SRCS)
DES_SRCS = des_enc.c fcrypt_b.c
.endif
DES_SRCS += cbc_cksm.c cbc_enc.c  cfb64enc.c cfb_enc.c  \
d15 1
@


1.11.6.1
log
@sync with head.
@
text
@d1 1
a1 1
#	$NetBSD: des.inc,v 1.11 2007/12/09 22:44:15 adrianp Exp $
d10 2
a11 4
.if !defined(DES_SRCS)
DES_SRCS = des_enc.c fcrypt_b.c
.endif
DES_SRCS += cbc_cksm.c cbc_enc.c  cfb64enc.c cfb_enc.c  \
d15 1
@


1.10
log
@Don't add every source directory to the -I path.
Instead use CPPFLAGS.file to add the relevant directory for each file.
Removes about 4000000 failed open() system calls from the libcrypto build,
and reduces the compile time (on my system) from 154 seconds to 115 seconds.
The arch/*/*.inc files need similar treatment.
@
text
@d1 1
a1 1
#	$NetBSD: des.inc,v 1.9 2003/07/24 14:16:32 itojun Exp $
d5 1
a5 1
#	SRCS extracted from /home/current/src/lib/libcrypto/../../crypto/dist/openssl/crypto/des/Makefile.ssl
@


1.10.10.1
log
@sync with HEAD
@
text
@d1 1
a1 1
#	$NetBSD$
d5 1
a5 1
#	SRCS extracted from src/crypto/dist/openssl/crypto/des/Makefile
@


1.9
log
@upgrade openssl to 0.9.7b.  (AES is now supported)
alter des.h to be friendly with openssl/des.h (you can include both in the
same file)
make libkrb to depend on libdes.  bump major.
massage various portioin of heimdal to be friendly with openssl 0.9.7b.
@
text
@d1 1
a1 1
#	$NetBSD: des.inc,v 1.8 2001/09/10 02:56:57 thorpej Exp $
a9 1
CPPFLAGS+=	-I${OPENSSLSRC}/crypto/des
d11 1
a11 1
SRCS+=	cbc_cksm.c cbc_enc.c  cfb64enc.c cfb_enc.c  \
d20 5
@


1.8
log
@Do the CPU-specific optimization flags a better way, suggested
by Simon Burge.
@
text
@d1 1
a1 1
#	$NetBSD: des.inc,v 1.7 2001/09/09 21:22:09 tls Exp $
d15 2
a16 2
	qud_cksm.c rand_key.c read_pwd.c rpc_enc.c  set_key.c  \
	des_enc.c fcrypt_b.c read2pwd.c \
d18 3
a20 1
	str2key.c  cfb64ede.c ofb64ede.c ede_cbcm_enc.c
@


1.7
log
@Use MACHINE_CPU, not MACHINE_ARCH, to select optimizations.  Add BF_PTR/BF_PTR2 tweaks to bf.inc
@
text
@d1 1
a1 1
#	$NetBSD: des.inc,v 1.6 2001/09/09 20:54:25 tls Exp $
a10 13

.if (${MACHINE_CPU} == "mips" || ${MACHINE_CPU} == "i386")
CPPFLAGS+=	-DDES_UNROLL -DDES_RISC2 -DDES_PTR
.endif
.if (${MACHINE_CPU} == "sparc64")
CPPFLAGS+=	-DDES_UNROLL -DDES_RISC1 -DDES_PTR
.endif
.if (${MACHINE_CPU} == "alpha")
CPPFLAGS+=	-DDES_RISC2 -DDES_PTR
.endif
.if (${MACHINE_CPU} == "powerpc" || ${MACHINE_ARCH} == "sparc")
CPPFLAGS+=	-DDES_UNROLL
.endif
@


1.6
log
@tweak the x86 options a bit
@
text
@d1 1
a1 1
#	$NetBSD: des.inc,v 1.5 2001/09/09 20:41:47 tls Exp $
d12 1
a12 1
.if (${MACHINE_ARCH} == "mips" || ${MACHINE_ARCH} == "i386")
d15 1
a15 1
.if (${MACHINE_ARCH} == "sparc64")
d18 1
a18 1
.if (${MACHINE_ARCH} == "alpha")
d21 1
a21 1
.if (${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc")
@


1.5
log
@Add some of the options to select optimizations of the C DES code for
different architectures.

Doesn't help some platforms much, helps others quite a bit.  These
options are from options.txt in the libdes/libcrypto distribution; it
would probably be best to test and replace them with what's best with
the current gcc on each of our architectures.
@
text
@d1 1
a1 1
#	$NetBSD: des.inc,v 1.4 2001/04/12 07:48:04 itojun Exp $
d12 1
a12 1
.if (${MACHINE_ARCH} == "mips")
d15 1
a15 1
.if (${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "i386")
@


1.4
log
@use openssl 0.9.6a.  shlib major # is bumped for libcrypto, libssl and
all kerberos libraries.
@
text
@d1 1
a1 1
#	$NetBSD: des.inc,v 1.3 2000/07/16 07:16:22 mrg Exp $
d11 13
@


1.3
log
@update for openssl 0.9.5a
@
text
@d1 1
a1 1
#	$NetBSD$
d12 7
a18 9
SRCS+= set_key.c  ecb_enc.c  cbc_enc.c \
	ecb3_enc.c cfb64enc.c cfb64ede.c cfb_enc.c  ofb64ede.c \
	enc_read.c enc_writ.c ofb64enc.c \
	ofb_enc.c  str2key.c  pcbc_enc.c qud_cksm.c rand_key.c \
	 des_enc.c fcrypt_b.c  read2pwd.c \
	fcrypt.c xcbc_enc.c read_pwd.c rpc_enc.c  cbc_cksm.c \
	ede_cbcm_enc.c


@


1.2
log
@s/CFLAGS/CPPFLAGS/g
@
text
@d1 1
a1 1
#	$NetBSD: des.inc,v 1.1.1.1 2000/06/16 04:21:32 thorpej Exp $
d5 1
a5 1
#	SRCS extracted from ../../dist/openssl/crypto/des/Makefile.ssl
d17 1
a17 1
	fcrypt.c xcbc_enc.c read_pwd.c rpc_enc.c  cbc_cksm.c supp.c \
@


1.2.2.1
log
@file des.inc was added on branch minoura-xpg4dl on 2000-06-23 16:16:22 +0000
@
text
@d1 20
@


1.2.2.2
log
@Sync w/ netbsd-1-5-base.
@
text
@a0 20
#	$NetBSD: des.inc,v 1.2.2.1 2000/06/23 16:16:22 minoura Exp $
#
#	@@(#) Copyright (c) 1995 Simon J. Gerraty
#
#	SRCS extracted from ../../dist/openssl/crypto/des/Makefile.ssl
#

.PATH:	${OPENSSLSRC}/crypto/des

CFLAGS+=	-I${OPENSSLSRC}/crypto/des

SRCS+= set_key.c  ecb_enc.c  cbc_enc.c \
	ecb3_enc.c cfb64enc.c cfb64ede.c cfb_enc.c  ofb64ede.c \
	enc_read.c enc_writ.c ofb64enc.c \
	ofb_enc.c  str2key.c  pcbc_enc.c qud_cksm.c rand_key.c \
	 des_enc.c fcrypt_b.c  read2pwd.c \
	fcrypt.c xcbc_enc.c read_pwd.c rpc_enc.c  cbc_cksm.c supp.c \
	ede_cbcm_enc.c


@


1.1
log
@Initial revision
@
text
@d1 1
a1 1
#	$NetBSD: des.inc,v 1.1 1999/07/23 01:32:59 mrg Exp $
d10 1
a10 1
CFLAGS+=	-I${OPENSSLSRC}/crypto/des
@


1.1.1.1
log
@Import libcrypto build framework from cryptosrc-intl.
@
text
@@


1.1.1.1.2.1
log
@Pull up rev 1.2:
s/CFLAGS/CPPFLAGS/g
@
text
@d1 1
a1 1
#	$NetBSD: des.inc,v 1.2 2000/06/21 19:34:24 thorpej Exp $
d10 1
a10 1
CPPFLAGS+=	-I${OPENSSLSRC}/crypto/des
@


1.1.1.1.2.2
log
@pull up openssl 0.9.5a (requested by thorpej)
@
text
@d1 1
a1 1
#	$NetBSD$
d5 1
a5 1
#	SRCS extracted from /home/current/src/lib/libcrypto/../../crypto/dist/openssl/crypto/des/Makefile.ssl
d17 1
a17 1
	fcrypt.c xcbc_enc.c read_pwd.c rpc_enc.c  cbc_cksm.c \
@


1.1.1.1.2.3
log
@Pull up revisions 1.4-1.8 (requested by itojun,he):
  Update OpenSSL to version 0.9.6g.  Includes major version bump for
  libcrypto and all the dependent libraries.
@
text
@d12 9
a20 7
SRCS+=	cbc_cksm.c cbc_enc.c  cfb64enc.c cfb_enc.c  \
	ecb3_enc.c ecb_enc.c  enc_read.c enc_writ.c \
	fcrypt.c ofb64enc.c ofb_enc.c  pcbc_enc.c \
	qud_cksm.c rand_key.c read_pwd.c rpc_enc.c  set_key.c  \
	des_enc.c fcrypt_b.c read2pwd.c \
	xcbc_enc.c \
	str2key.c  cfb64ede.c ofb64ede.c ede_cbcm_enc.c
@