diff options
| author | markus@openbsd.org <markus@openbsd.org> | 2015-01-14 10:24:42 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-01-14 21:32:54 +1100 |
| commit | 60c2c4ea5e1ad0ddfe8b2877b78ed5143be79c53 (patch) | |
| tree | 55c765df3aed7aedbdd5bcd2a4d3d82e71280820 /cipher-bf1.c | |
| parent | 128343bcdb0b60fc826f2733df8cf979ec1627b4 (diff) | |
upstream commit
remove unneeded includes, sync my copyright across files
& whitespace; ok djm@
Diffstat (limited to 'cipher-bf1.c')
| -rw-r--r-- | cipher-bf1.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/cipher-bf1.c b/cipher-bf1.c index 309509dd..64c74bc6 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 <sys/types.h> -#include <openssl/evp.h> - #include <stdarg.h> #include <string.h> -#include "xmalloc.h" -#include "log.h" +#include <openssl/evp.h> #include "openbsd-compat/openssl-compat.h" |