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 309509dd7..64c74bc6f 100644 --- a/cipher-bf1.c +++ b/cipher-bf1.c | |||
@@ -1,15 +1,10 @@ | |||
1 | /* $OpenBSD: cipher-bf1.c,v 1.6 2010/10/01 23:05:32 djm Exp $ */ | 1 | /* $OpenBSD: cipher-bf1.c,v 1.7 2015/01/14 10:24:42 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2003 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2003 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
5 | * Redistribution and use in source and binary forms, with or without | 5 | * Permission to use, copy, modify, and distribute this software for any |
6 | * modification, are permitted provided that the following conditions | 6 | * purpose with or without fee is hereby granted, provided that the above |
7 | * are met: | 7 | * copyright notice and this permission notice appear in all copies. |
8 | * 1. Redistributions of source code must retain the above copyright | ||
9 | * notice, this list of conditions and the following disclaimer. | ||
10 | * 2. Redistributions in binary form must reproduce the above copyright | ||
11 | * notice, this list of conditions and the following disclaimer in the | ||
12 | * documentation and/or other materials provided with the distribution. | ||
13 | * | 8 | * |
14 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | 9 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
15 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | 10 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
@@ -27,13 +22,10 @@ | |||
27 | 22 | ||
28 | #include <sys/types.h> | 23 | #include <sys/types.h> |
29 | 24 | ||
30 | #include <openssl/evp.h> | ||
31 | |||
32 | #include <stdarg.h> | 25 | #include <stdarg.h> |
33 | #include <string.h> | 26 | #include <string.h> |
34 | 27 | ||
35 | #include "xmalloc.h" | 28 | #include <openssl/evp.h> |
36 | #include "log.h" | ||
37 | 29 | ||
38 | #include "openbsd-compat/openssl-compat.h" | 30 | #include "openbsd-compat/openssl-compat.h" |
39 | 31 | ||