From 60c2c4ea5e1ad0ddfe8b2877b78ed5143be79c53 Mon Sep 17 00:00:00 2001 From: "markus@openbsd.org" Date: Wed, 14 Jan 2015 10:24:42 +0000 Subject: upstream commit remove unneeded includes, sync my copyright across files & whitespace; ok djm@ --- cipher-bf1.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'cipher-bf1.c') diff --git a/cipher-bf1.c b/cipher-bf1.c index 309509dd7..64c74bc6f 100644 --- a/cipher-bf1.c +++ b/cipher-bf1.c @@ -1,15 +1,10 @@ -/* $OpenBSD: cipher-bf1.c,v 1.6 2010/10/01 23:05:32 djm Exp $ */ +/* $OpenBSD: cipher-bf1.c,v 1.7 2015/01/14 10:24:42 markus Exp $ */ /* * Copyright (c) 2003 Markus Friedl. All rights reserved. * - * 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. + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -27,13 +22,10 @@ #include -#include - #include #include -#include "xmalloc.h" -#include "log.h" +#include #include "openbsd-compat/openssl-compat.h" -- cgit v1.2.3