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 | |
parent | 128343bcdb0b60fc826f2733df8cf979ec1627b4 (diff) |
upstream commit
remove unneeded includes, sync my copyright across files
& whitespace; ok djm@
-rw-r--r-- | cipher-3des1.c | 21 | ||||
-rw-r--r-- | cipher-aesctr.c | 4 | ||||
-rw-r--r-- | cipher-bf1.c | 18 | ||||
-rw-r--r-- | cipher-chachapoly.c | 3 | ||||
-rw-r--r-- | cipher.h | 8 |
5 files changed, 18 insertions, 36 deletions
diff --git a/cipher-3des1.c b/cipher-3des1.c index 2753f9a0..6a0f1f37 100644 --- a/cipher-3des1.c +++ b/cipher-3des1.c @@ -1,15 +1,10 @@ -/* $OpenBSD: cipher-3des1.c,v 1.11 2014/07/02 04:59:06 djm Exp $ */ +/* $OpenBSD: cipher-3des1.c,v 1.12 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 @@ -26,13 +21,9 @@ #include "includes.h" #include <sys/types.h> - -#include <openssl/evp.h> - #include <string.h> +#include <openssl/evp.h> -#include "xmalloc.h" -#include "log.h" #include "ssherr.h" /* @@ -151,7 +142,7 @@ evp_ssh1_3des(void) { static EVP_CIPHER ssh1_3des; - memset(&ssh1_3des, 0, sizeof(EVP_CIPHER)); + memset(&ssh1_3des, 0, sizeof(ssh1_3des)); ssh1_3des.nid = NID_undef; ssh1_3des.block_size = 8; ssh1_3des.iv_len = 0; diff --git a/cipher-aesctr.c b/cipher-aesctr.c index a4cf61e4..e1361519 100644 --- a/cipher-aesctr.c +++ b/cipher-aesctr.c @@ -1,6 +1,6 @@ -/* $OpenBSD: cipher-aesctr.c,v 1.1 2014/04/29 15:39:33 markus Exp $ */ +/* $OpenBSD: cipher-aesctr.c,v 1.2 2015/01/14 10:24:42 markus Exp $ */ /* - * Copyright (c) 2003 Markus Friedl <markus@openbsd.org> + * Copyright (c) 2003 Markus Friedl. All rights reserved. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above 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" diff --git a/cipher-chachapoly.c b/cipher-chachapoly.c index 8665b41a..7f31ff4c 100644 --- a/cipher-chachapoly.c +++ b/cipher-chachapoly.c @@ -14,7 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $OpenBSD: cipher-chachapoly.c,v 1.6 2014/07/03 12:42:16 jsing Exp $ */ +/* $OpenBSD: cipher-chachapoly.c,v 1.7 2015/01/14 10:24:42 markus Exp $ */ #include "includes.h" @@ -116,4 +116,3 @@ chachapoly_get_length(struct chachapoly_ctx *ctx, *plenp = PEEK_U32(buf); return 0; } - @@ -1,4 +1,4 @@ -/* $OpenBSD: cipher.h,v 1.46 2014/06/24 01:13:21 djm Exp $ */ +/* $OpenBSD: cipher.h,v 1.47 2015/01/14 10:24:42 markus Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -72,19 +72,19 @@ struct sshcipher_ctx { const struct sshcipher *cipher; }; -typedef struct sshcipher Cipher ; -typedef struct sshcipher_ctx CipherContext ; +typedef struct sshcipher Cipher; +typedef struct sshcipher_ctx CipherContext; u_int cipher_mask_ssh1(int); const struct sshcipher *cipher_by_name(const char *); const struct sshcipher *cipher_by_number(int); int cipher_number(const char *); char *cipher_name(int); +const char *cipher_warning_message(const struct sshcipher_ctx *); int ciphers_valid(const char *); char *cipher_alg_list(char, int); int cipher_init(struct sshcipher_ctx *, const struct sshcipher *, const u_char *, u_int, const u_char *, u_int, int); -const char* cipher_warning_message(const struct sshcipher_ctx *); int cipher_crypt(struct sshcipher_ctx *, u_int, u_char *, const u_char *, u_int, u_int, u_int); int cipher_get_length(struct sshcipher_ctx *, u_int *, u_int, |