summaryrefslogtreecommitdiff
path: root/lib/libc/crypt/blowfish.c
diff options
context:
space:
mode:
authorNiels Provos <provos@cvs.openbsd.org>1997-02-14 18:40:19 +0000
committerNiels Provos <provos@cvs.openbsd.org>1997-02-14 18:40:19 +0000
commit9e8a28c43fc70f15f72a3553a69b020de77b100c (patch)
tree2398ccd33b9136cd4334b089ab1ed8df887bec29 /lib/libc/crypt/blowfish.c
parent097cb26b58c23763ea91cfae3d6b6f6313589950 (diff)
header update
Diffstat (limited to 'lib/libc/crypt/blowfish.c')
-rw-r--r--lib/libc/crypt/blowfish.c43
1 files changed, 33 insertions, 10 deletions
diff --git a/lib/libc/crypt/blowfish.c b/lib/libc/crypt/blowfish.c
index cce6e85901b..558d6d7b38f 100644
--- a/lib/libc/crypt/blowfish.c
+++ b/lib/libc/crypt/blowfish.c
@@ -1,12 +1,35 @@
-/* $OpenBSD: blowfish.c,v 1.1 1997/02/13 16:28:33 provos Exp $ */
+/* $OpenBSD: blowfish.c,v 1.2 1997/02/14 18:40:18 provos Exp $ */
/*
* Blowfish block cipher for OpenBSD
* Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
+ * All rights reserved.
+ *
* Implementation advice by David Mazieres <dm@lcs.mit.edu>.
- * Modification and redistribution in source and binary forms is
- * permitted provided that due credit is given to the author and the
- * OpenBSD project (for instance by leaving this copyright notice
- * intact).
+ *
+ * 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. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by Theo de Raadt.
+ * 4. 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.
*/
/*
@@ -35,14 +58,14 @@ static inline u_int32_t F __P((blf_ctx * bc, u_int32_t x));
/* Standard Blowfish */
- void blf_key __P((blf_ctx * c, u_int8_t * k, u_int16_t len));
- void blf_enc __P((blf_ctx * c, u_int32_t * data, u_int16_t blocks));
- void blf_dec __P((blf_ctx * c, u_int32_t * data, u_int16_t blocks));
+void blf_key __P((blf_ctx * c, u_int8_t * k, u_int16_t len));
+void blf_enc __P((blf_ctx * c, u_int32_t * data, u_int16_t blocks));
+void blf_dec __P((blf_ctx * c, u_int32_t * data, u_int16_t blocks));
/* Function for Feistel Networks */
- static inline u_int32_t
- F(bc, x)
+static inline u_int32_t
+F(bc, x)
blf_ctx *bc;
u_int32_t x;
{