[Midnightbsd-cvs] src [9918] trunk/sys/opencrypto: sync with freebsd
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri May 25 08:57:03 EDT 2018
Revision: 9918
http://svnweb.midnightbsd.org/src/?rev=9918
Author: laffer1
Date: 2018-05-25 08:57:02 -0400 (Fri, 25 May 2018)
Log Message:
-----------
sync with freebsd
Modified Paths:
--------------
trunk/sys/opencrypto/cast.c
trunk/sys/opencrypto/cast.h
trunk/sys/opencrypto/castsb.h
trunk/sys/opencrypto/criov.c
trunk/sys/opencrypto/crypto.c
trunk/sys/opencrypto/cryptodev.c
trunk/sys/opencrypto/cryptodev.h
trunk/sys/opencrypto/cryptodev_if.m
trunk/sys/opencrypto/cryptosoft.c
trunk/sys/opencrypto/cryptosoft.h
trunk/sys/opencrypto/deflate.c
trunk/sys/opencrypto/deflate.h
trunk/sys/opencrypto/rmd160.c
trunk/sys/opencrypto/rmd160.h
trunk/sys/opencrypto/skipjack.c
trunk/sys/opencrypto/skipjack.h
trunk/sys/opencrypto/xform.c
trunk/sys/opencrypto/xform.h
Added Paths:
-----------
trunk/sys/opencrypto/cryptodeflate.c
Property Changed:
----------------
trunk/sys/opencrypto/cryptodev_if.m
Modified: trunk/sys/opencrypto/cast.c
===================================================================
--- trunk/sys/opencrypto/cast.c 2018-05-25 12:55:40 UTC (rev 9917)
+++ trunk/sys/opencrypto/cast.c 2018-05-25 12:57:02 UTC (rev 9918)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* $OpenBSD: cast.c,v 1.2 2000/06/06 06:49:47 deraadt Exp $ */
/*-
* CAST-128 in C
@@ -7,7 +8,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/opencrypto/cast.c 171238 2007-07-05 06:59:14Z peter $");
#include <sys/types.h>
#include <opencrypto/cast.h>
Modified: trunk/sys/opencrypto/cast.h
===================================================================
--- trunk/sys/opencrypto/cast.h 2018-05-25 12:55:40 UTC (rev 9917)
+++ trunk/sys/opencrypto/cast.h 2018-05-25 12:57:02 UTC (rev 9918)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/sys/opencrypto/cast.h 139825 2005-01-07 02:29:27Z imp $ */
/* $OpenBSD: cast.h,v 1.2 2002/03/14 01:26:51 millert Exp $ */
/*-
Modified: trunk/sys/opencrypto/castsb.h
===================================================================
--- trunk/sys/opencrypto/castsb.h 2018-05-25 12:55:40 UTC (rev 9917)
+++ trunk/sys/opencrypto/castsb.h 2018-05-25 12:57:02 UTC (rev 9918)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/sys/opencrypto/castsb.h 139825 2005-01-07 02:29:27Z imp $ */
/* $OpenBSD: castsb.h,v 1.1 2000/02/28 23:13:04 deraadt Exp $ */
/*-
* CAST-128 in C
Modified: trunk/sys/opencrypto/criov.c
===================================================================
--- trunk/sys/opencrypto/criov.c 2018-05-25 12:55:40 UTC (rev 9917)
+++ trunk/sys/opencrypto/criov.c 2018-05-25 12:57:02 UTC (rev 9918)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* $OpenBSD: criov.c,v 1.9 2002/01/29 15:48:29 jason Exp $ */
/*-
@@ -28,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/opencrypto/criov.c 159241 2006-06-04 22:15:13Z pjd $");
#include <sys/param.h>
#include <sys/systm.h>
Modified: trunk/sys/opencrypto/crypto.c
===================================================================
--- trunk/sys/opencrypto/crypto.c 2018-05-25 12:55:40 UTC (rev 9917)
+++ trunk/sys/opencrypto/crypto.c 2018-05-25 12:57:02 UTC (rev 9918)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2002-2006 Sam Leffler. All rights reserved.
*
@@ -23,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/opencrypto/crypto.c 208834 2010-06-05 16:00:53Z kib $");
/*
* Cryptographic Subsystem.
Added: trunk/sys/opencrypto/cryptodeflate.c
===================================================================
--- trunk/sys/opencrypto/cryptodeflate.c (rev 0)
+++ trunk/sys/opencrypto/cryptodeflate.c 2018-05-25 12:57:02 UTC (rev 9918)
@@ -0,0 +1,266 @@
+/* $MidnightBSD$ */
+/* $OpenBSD: deflate.c,v 1.3 2001/08/20 02:45:22 hugh Exp $ */
+
+/*-
+ * Copyright (c) 2001 Jean-Jacques Bernard-Gundol (jj at wabbitt.org)
+ *
+ * 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 above 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. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
+ */
+
+/*
+ * This file contains a wrapper around the deflate algo compression
+ * functions using the zlib library (see net/zlib.{c,h})
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: stable/10/sys/opencrypto/cryptodeflate.c 260817 2014-01-17 10:58:59Z avg $");
+
+#include "opt_kdtrace.h"
+
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/malloc.h>
+#include <sys/param.h>
+#include <sys/kernel.h>
+#include <sys/sdt.h>
+#include <sys/systm.h>
+#include <net/zlib.h>
+
+#include <opencrypto/cryptodev.h>
+#include <opencrypto/deflate.h>
+
+SDT_PROVIDER_DECLARE(opencrypto);
+SDT_PROBE_DEFINE2(opencrypto, deflate, deflate_global, entry,
+ "int", "u_int32_t");
+SDT_PROBE_DEFINE5(opencrypto, deflate, deflate_global, bad,
+ "int", "int", "int", "int", "int");
+SDT_PROBE_DEFINE5(opencrypto, deflate, deflate_global, iter,
+ "int", "int", "int", "int", "int");
+SDT_PROBE_DEFINE2(opencrypto, deflate, deflate_global, return,
+ "int", "u_int32_t");
+
+int window_inflate = -1 * MAX_WBITS;
+int window_deflate = -12;
+
+/*
+ * This function takes a block of data and (de)compress it using the deflate
+ * algorithm
+ */
+
+u_int32_t
+deflate_global(data, size, decomp, out)
+ u_int8_t *data;
+ u_int32_t size;
+ int decomp;
+ u_int8_t **out;
+{
+ /* decomp indicates whether we compress (0) or decompress (1) */
+
+ z_stream zbuf;
+ u_int8_t *output;
+ u_int32_t count, result;
+ int error, i;
+ struct deflate_buf *bufh, *bufp;
+
+ SDT_PROBE2(opencrypto, deflate, deflate_global, entry, decomp, size);
+
+ bufh = bufp = NULL;
+ if (!decomp) {
+ i = 1;
+ } else {
+ /*
+ * Choose a buffer with 4x the size of the input buffer
+ * for the size of the output buffer in the case of
+ * decompression. If it's not sufficient, it will need to be
+ * updated while the decompression is going on.
+ */
+ i = 4;
+ }
+ /*
+ * Make sure we do have enough output space. Repeated calls to
+ * deflate need at least 6 bytes of output buffer space to avoid
+ * repeated markers. We will always provide at least 16 bytes.
+ */
+ while ((size * i) < 16)
+ i++;
+
+ bufh = bufp = malloc(sizeof(*bufp) + (size_t)(size * i),
+ M_CRYPTO_DATA, M_NOWAIT);
+ if (bufp == NULL) {
+ SDT_PROBE3(opencrypto, deflate, deflate_global, bad,
+ decomp, 0, __LINE__);
+ goto bad2;
+ }
+ bufp->next = NULL;
+ bufp->size = size * i;
+
+ bzero(&zbuf, sizeof(z_stream));
+ zbuf.zalloc = z_alloc;
+ zbuf.zfree = z_free;
+ zbuf.opaque = Z_NULL;
+ zbuf.next_in = data; /* Data that is going to be processed. */
+ zbuf.avail_in = size; /* Total length of data to be processed. */
+ zbuf.next_out = bufp->data;
+ zbuf.avail_out = bufp->size;
+
+ error = decomp ? inflateInit2(&zbuf, window_inflate) :
+ deflateInit2(&zbuf, Z_DEFAULT_COMPRESSION, Z_METHOD,
+ window_deflate, Z_MEMLEVEL, Z_DEFAULT_STRATEGY);
+ if (error != Z_OK) {
+ SDT_PROBE3(opencrypto, deflate, deflate_global, bad,
+ decomp, error, __LINE__);
+ goto bad;
+ }
+
+ for (;;) {
+ error = decomp ? inflate(&zbuf, Z_SYNC_FLUSH) :
+ deflate(&zbuf, Z_FINISH);
+ if (error != Z_OK && error != Z_STREAM_END) {
+ /*
+ * Unfortunately we are limited to 5 arguments,
+ * thus use two probes.
+ */
+ SDT_PROBE5(opencrypto, deflate, deflate_global, bad,
+ decomp, error, __LINE__,
+ zbuf.avail_in, zbuf.avail_out);
+ SDT_PROBE5(opencrypto, deflate, deflate_global, bad,
+ decomp, error, __LINE__,
+ zbuf.state->dummy, zbuf.total_out);
+ goto bad;
+ }
+ SDT_PROBE5(opencrypto, deflate, deflate_global, iter,
+ decomp, error, __LINE__,
+ zbuf.avail_in, zbuf.avail_out);
+ SDT_PROBE5(opencrypto, deflate, deflate_global, iter,
+ decomp, error, __LINE__,
+ zbuf.state->dummy, zbuf.total_out);
+ if (decomp && zbuf.avail_in == 0 && error == Z_STREAM_END) {
+ /* Done. */
+ break;
+ } else if (!decomp && error == Z_STREAM_END) {
+ /* Done. */
+ break;
+ } else if (zbuf.avail_out == 0) {
+ struct deflate_buf *p;
+
+ /* We need more output space for another iteration. */
+ p = malloc(sizeof(*p) + (size_t)(size * i),
+ M_CRYPTO_DATA, M_NOWAIT);
+ if (p == NULL) {
+ SDT_PROBE3(opencrypto, deflate, deflate_global,
+ bad, decomp, 0, __LINE__);
+ goto bad;
+ }
+ p->next = NULL;
+ p->size = size * i;
+ bufp->next = p;
+ bufp = p;
+ zbuf.next_out = bufp->data;
+ zbuf.avail_out = bufp->size;
+ } else {
+ /* Unexpect result. */
+ /*
+ * Unfortunately we are limited to 5 arguments,
+ * thus, again, use two probes.
+ */
+ SDT_PROBE5(opencrypto, deflate, deflate_global, bad,
+ decomp, error, __LINE__,
+ zbuf.avail_in, zbuf.avail_out);
+ SDT_PROBE5(opencrypto, deflate, deflate_global, bad,
+ decomp, error, __LINE__,
+ zbuf.state->dummy, zbuf.total_out);
+ goto bad;
+ }
+ }
+
+ result = count = zbuf.total_out;
+
+ *out = malloc(result, M_CRYPTO_DATA, M_NOWAIT);
+ if (*out == NULL) {
+ SDT_PROBE3(opencrypto, deflate, deflate_global, bad,
+ decomp, 0, __LINE__);
+ goto bad;
+ }
+ if (decomp)
+ inflateEnd(&zbuf);
+ else
+ deflateEnd(&zbuf);
+ output = *out;
+ for (bufp = bufh; bufp != NULL; ) {
+ if (count > bufp->size) {
+ struct deflate_buf *p;
+
+ bcopy(bufp->data, *out, bufp->size);
+ *out += bufp->size;
+ count -= bufp->size;
+ p = bufp;
+ bufp = bufp->next;
+ free(p, M_CRYPTO_DATA);
+ } else {
+ /* It should be the last buffer. */
+ bcopy(bufp->data, *out, count);
+ *out += count;
+ free(bufp, M_CRYPTO_DATA);
+ bufp = NULL;
+ count = 0;
+ }
+ }
+ *out = output;
+ SDT_PROBE2(opencrypto, deflate, deflate_global, return, decomp, result);
+ return result;
+
+bad:
+ if (decomp)
+ inflateEnd(&zbuf);
+ else
+ deflateEnd(&zbuf);
+ for (bufp = bufh; bufp != NULL; ) {
+ struct deflate_buf *p;
+
+ p = bufp;
+ bufp = bufp->next;
+ free(p, M_CRYPTO_DATA);
+ }
+bad2:
+ *out = NULL;
+ return 0;
+}
+
+void *
+z_alloc(nil, type, size)
+ void *nil;
+ u_int type, size;
+{
+ void *ptr;
+
+ ptr = malloc(type *size, M_CRYPTO_DATA, M_NOWAIT);
+ return ptr;
+}
+
+void
+z_free(nil, ptr)
+ void *nil, *ptr;
+{
+ free(ptr, M_CRYPTO_DATA);
+}
Property changes on: trunk/sys/opencrypto/cryptodeflate.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/sys/opencrypto/cryptodev.c
===================================================================
--- trunk/sys/opencrypto/cryptodev.c 2018-05-25 12:55:40 UTC (rev 9917)
+++ trunk/sys/opencrypto/cryptodev.c 2018-05-25 12:57:02 UTC (rev 9918)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* $OpenBSD: cryptodev.c,v 1.52 2002/06/19 07:22:46 deraadt Exp $ */
/*-
@@ -33,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/opencrypto/cryptodev.c 254356 2013-08-15 07:54:31Z glebius $");
#include "opt_compat.h"
@@ -304,6 +305,7 @@
.fo_close = cryptof_close,
.fo_chmod = invfo_chmod,
.fo_chown = invfo_chown,
+ .fo_sendfile = invfo_sendfile,
};
static struct csession *csefind(struct fcrypt *, u_int);
Modified: trunk/sys/opencrypto/cryptodev.h
===================================================================
--- trunk/sys/opencrypto/cryptodev.h 2018-05-25 12:55:40 UTC (rev 9917)
+++ trunk/sys/opencrypto/cryptodev.h 2018-05-25 12:57:02 UTC (rev 9918)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/sys/opencrypto/cryptodev.h 213068 2010-09-23 11:52:32Z pjd $ */
/* $OpenBSD: cryptodev.h,v 1.31 2002/06/11 11:14:29 beck Exp $ */
/*-
Modified: trunk/sys/opencrypto/cryptodev_if.m
===================================================================
--- trunk/sys/opencrypto/cryptodev_if.m 2018-05-25 12:55:40 UTC (rev 9917)
+++ trunk/sys/opencrypto/cryptodev_if.m 2018-05-25 12:57:02 UTC (rev 9918)
@@ -23,8 +23,8 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
-#
+# $FreeBSD: stable/10/sys/opencrypto/cryptodev_if.m 167756 2007-03-21 03:43:33Z sam $
+# $MidnightBSD$
#include <sys/malloc.h>
#include <opencrypto/cryptodev.h>
Property changes on: trunk/sys/opencrypto/cryptodev_if.m
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/opencrypto/cryptosoft.c
===================================================================
--- trunk/sys/opencrypto/cryptosoft.c 2018-05-25 12:55:40 UTC (rev 9917)
+++ trunk/sys/opencrypto/cryptosoft.c 2018-05-25 12:57:02 UTC (rev 9918)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* $OpenBSD: cryptosoft.c,v 1.35 2002/04/26 08:43:50 deraadt Exp $ */
/*-
@@ -23,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/opencrypto/cryptosoft.c 215295 2010-11-14 13:09:32Z marius $");
#include <sys/param.h>
#include <sys/systm.h>
Modified: trunk/sys/opencrypto/cryptosoft.h
===================================================================
--- trunk/sys/opencrypto/cryptosoft.h 2018-05-25 12:55:40 UTC (rev 9917)
+++ trunk/sys/opencrypto/cryptosoft.h 2018-05-25 12:57:02 UTC (rev 9918)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/sys/opencrypto/cryptosoft.h 167755 2007-03-21 03:42:51Z sam $ */
/* $OpenBSD: cryptosoft.h,v 1.10 2002/04/22 23:10:09 deraadt Exp $ */
/*-
Modified: trunk/sys/opencrypto/deflate.c
===================================================================
--- trunk/sys/opencrypto/deflate.c 2018-05-25 12:55:40 UTC (rev 9917)
+++ trunk/sys/opencrypto/deflate.c 2018-05-25 12:57:02 UTC (rev 9918)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* $OpenBSD: deflate.c,v 1.3 2001/08/20 02:45:22 hugh Exp $ */
/*-
Modified: trunk/sys/opencrypto/deflate.h
===================================================================
--- trunk/sys/opencrypto/deflate.h 2018-05-25 12:55:40 UTC (rev 9917)
+++ trunk/sys/opencrypto/deflate.h 2018-05-25 12:57:02 UTC (rev 9918)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/sys/opencrypto/deflate.h 199895 2009-11-28 21:08:19Z bz $ */
/* $OpenBSD: deflate.h,v 1.3 2002/03/14 01:26:51 millert Exp $ */
/*-
Modified: trunk/sys/opencrypto/rmd160.c
===================================================================
--- trunk/sys/opencrypto/rmd160.c 2018-05-25 12:55:40 UTC (rev 9917)
+++ trunk/sys/opencrypto/rmd160.c 2018-05-25 12:57:02 UTC (rev 9918)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* $OpenBSD: rmd160.c,v 1.3 2001/09/26 21:40:13 markus Exp $ */
/*-
* Copyright (c) 2001 Markus Friedl. All rights reserved.
@@ -30,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/opencrypto/rmd160.c 139825 2005-01-07 02:29:27Z imp $");
#include <sys/param.h>
#include <sys/systm.h>
Modified: trunk/sys/opencrypto/rmd160.h
===================================================================
--- trunk/sys/opencrypto/rmd160.h 2018-05-25 12:55:40 UTC (rev 9917)
+++ trunk/sys/opencrypto/rmd160.h 2018-05-25 12:57:02 UTC (rev 9918)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/sys/opencrypto/rmd160.h 139825 2005-01-07 02:29:27Z imp $ */
/* $OpenBSD: rmd160.h,v 1.3 2002/03/14 01:26:51 millert Exp $ */
/*-
* Copyright (c) 2001 Markus Friedl. All rights reserved.
Modified: trunk/sys/opencrypto/skipjack.c
===================================================================
--- trunk/sys/opencrypto/skipjack.c 2018-05-25 12:55:40 UTC (rev 9917)
+++ trunk/sys/opencrypto/skipjack.c 2018-05-25 12:57:02 UTC (rev 9918)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/* $OpenBSD: skipjack.c,v 1.3 2001/05/05 00:31:34 angelos Exp $ */
/*-
* Further optimized test implementation of SKIPJACK algorithm
@@ -13,7 +14,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/opencrypto/skipjack.c 139825 2005-01-07 02:29:27Z imp $");
#include <sys/param.h>
Modified: trunk/sys/opencrypto/skipjack.h
===================================================================
--- trunk/sys/opencrypto/skipjack.h 2018-05-25 12:55:40 UTC (rev 9917)
+++ trunk/sys/opencrypto/skipjack.h 2018-05-25 12:57:02 UTC (rev 9918)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/sys/opencrypto/skipjack.h 139825 2005-01-07 02:29:27Z imp $ */
/* $OpenBSD: skipjack.h,v 1.3 2002/03/14 01:26:51 millert Exp $ */
/*-
Modified: trunk/sys/opencrypto/xform.c
===================================================================
--- trunk/sys/opencrypto/xform.c 2018-05-25 12:55:40 UTC (rev 9917)
+++ trunk/sys/opencrypto/xform.c 2018-05-25 12:57:02 UTC (rev 9918)
@@ -1,8 +1,10 @@
+/* $MidnightBSD$ */
/* $OpenBSD: xform.c,v 1.16 2001/08/28 12:20:43 ben Exp $ */
/*-
* The authors of this code are John Ioannidis (ji at tla.org),
- * Angelos D. Keromytis (kermit at csd.uch.gr) and
- * Niels Provos (provos at physnet.uni-hamburg.de).
+ * Angelos D. Keromytis (kermit at csd.uch.gr),
+ * Niels Provos (provos at physnet.uni-hamburg.de) and
+ * Damien Miller (djm at mindrot.org).
*
* This code was written by John Ioannidis for BSD/OS in Athens, Greece,
* in November 1995.
@@ -15,11 +17,15 @@
*
* Additional features in 1999 by Angelos D. Keromytis.
*
+ * AES XTS implementation in 2008 by Damien Miller
+ *
* Copyright (C) 1995, 1996, 1997, 1998, 1999 by John Ioannidis,
* Angelos D. Keromytis and Niels Provos.
*
* Copyright (C) 2001, Angelos D. Keromytis.
*
+ * Copyright (C) 2008, Damien Miller
+ *
* Permission to use, copy, and modify this software with or without fee
* is hereby granted, provided that this entire notice is included in
* all copies of any software which is or includes a copy or
@@ -37,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/opencrypto/xform.c 247061 2013-02-20 22:59:53Z pjd $");
#include <sys/param.h>
#include <sys/systm.h>
Modified: trunk/sys/opencrypto/xform.h
===================================================================
--- trunk/sys/opencrypto/xform.h 2018-05-25 12:55:40 UTC (rev 9917)
+++ trunk/sys/opencrypto/xform.h 2018-05-25 12:57:02 UTC (rev 9918)
@@ -1,4 +1,5 @@
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/sys/opencrypto/xform.h 314327 2017-02-27 08:27:38Z avg $ */
/* $OpenBSD: xform.h,v 1.8 2001/08/28 12:20:43 ben Exp $ */
/*-
@@ -27,7 +28,9 @@
#include <sys/md5.h>
#include <crypto/sha1.h>
-#include <crypto/sha2/sha2.h>
+#include <crypto/sha2/sha256.h>
+#include <crypto/sha2/sha384.h>
+#include <crypto/sha2/sha512.h>
#include <opencrypto/rmd160.h>
/* Declarations */
More information about the Midnightbsd-cvs
mailing list