diff options
-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 2753f9a0e..6a0f1f37b 100644 --- a/cipher-3des1.c +++ b/cipher-3des1.c | |||
@@ -1,15 +1,10 @@ | |||
1 | /* $OpenBSD: cipher-3des1.c,v 1.11 2014/07/02 04:59:06 djm Exp $ */ | 1 | /* $OpenBSD: cipher-3des1.c,v 1.12 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 |
@@ -26,13 +21,9 @@ | |||
26 | #include "includes.h" | 21 | #include "includes.h" |
27 | 22 | ||
28 | #include <sys/types.h> | 23 | #include <sys/types.h> |
29 | |||
30 | #include <openssl/evp.h> | ||
31 | |||
32 | #include <string.h> | 24 | #include <string.h> |
25 | #include <openssl/evp.h> | ||
33 | 26 | ||
34 | #include "xmalloc.h" | ||
35 | #include "log.h" | ||
36 | #include "ssherr.h" | 27 | #include "ssherr.h" |
37 | 28 | ||
38 | /* | 29 | /* |
@@ -151,7 +142,7 @@ evp_ssh1_3des(void) | |||
151 | { | 142 | { |
152 | static EVP_CIPHER ssh1_3des; | 143 | static EVP_CIPHER ssh1_3des; |
153 | 144 | ||
154 | memset(&ssh1_3des, 0, sizeof(EVP_CIPHER)); | 145 | memset(&ssh1_3des, 0, sizeof(ssh1_3des)); |
155 | ssh1_3des.nid = NID_undef; | 146 | ssh1_3des.nid = NID_undef; |
156 | ssh1_3des.block_size = 8; | 147 | ssh1_3des.block_size = 8; |
157 | ssh1_3des.iv_len = 0; | 148 | ssh1_3des.iv_len = 0; |
diff --git a/cipher-aesctr.c b/cipher-aesctr.c index a4cf61e41..e13615195 100644 --- a/cipher-aesctr.c +++ b/cipher-aesctr.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* $OpenBSD: cipher-aesctr.c,v 1.1 2014/04/29 15:39:33 markus Exp $ */ | 1 | /* $OpenBSD: cipher-aesctr.c,v 1.2 2015/01/14 10:24:42 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2003 Markus Friedl <markus@openbsd.org> | 3 | * Copyright (c) 2003 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
5 | * Permission to use, copy, modify, and distribute this software for any | 5 | * Permission to use, copy, modify, and distribute this software for any |
6 | * purpose with or without fee is hereby granted, provided that the above | 6 | * purpose with or without fee is hereby granted, provided that the above |
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 | ||
diff --git a/cipher-chachapoly.c b/cipher-chachapoly.c index 8665b41a3..7f31ff4ce 100644 --- a/cipher-chachapoly.c +++ b/cipher-chachapoly.c | |||
@@ -14,7 +14,7 @@ | |||
14 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 14 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
15 | */ | 15 | */ |
16 | 16 | ||
17 | /* $OpenBSD: cipher-chachapoly.c,v 1.6 2014/07/03 12:42:16 jsing Exp $ */ | 17 | /* $OpenBSD: cipher-chachapoly.c,v 1.7 2015/01/14 10:24:42 markus Exp $ */ |
18 | 18 | ||
19 | #include "includes.h" | 19 | #include "includes.h" |
20 | 20 | ||
@@ -116,4 +116,3 @@ chachapoly_get_length(struct chachapoly_ctx *ctx, | |||
116 | *plenp = PEEK_U32(buf); | 116 | *plenp = PEEK_U32(buf); |
117 | return 0; | 117 | return 0; |
118 | } | 118 | } |
119 | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: cipher.h,v 1.46 2014/06/24 01:13:21 djm Exp $ */ | 1 | /* $OpenBSD: cipher.h,v 1.47 2015/01/14 10:24:42 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -72,19 +72,19 @@ struct sshcipher_ctx { | |||
72 | const struct sshcipher *cipher; | 72 | const struct sshcipher *cipher; |
73 | }; | 73 | }; |
74 | 74 | ||
75 | typedef struct sshcipher Cipher ; | 75 | typedef struct sshcipher Cipher; |
76 | typedef struct sshcipher_ctx CipherContext ; | 76 | typedef struct sshcipher_ctx CipherContext; |
77 | 77 | ||
78 | u_int cipher_mask_ssh1(int); | 78 | u_int cipher_mask_ssh1(int); |
79 | const struct sshcipher *cipher_by_name(const char *); | 79 | const struct sshcipher *cipher_by_name(const char *); |
80 | const struct sshcipher *cipher_by_number(int); | 80 | const struct sshcipher *cipher_by_number(int); |
81 | int cipher_number(const char *); | 81 | int cipher_number(const char *); |
82 | char *cipher_name(int); | 82 | char *cipher_name(int); |
83 | const char *cipher_warning_message(const struct sshcipher_ctx *); | ||
83 | int ciphers_valid(const char *); | 84 | int ciphers_valid(const char *); |
84 | char *cipher_alg_list(char, int); | 85 | char *cipher_alg_list(char, int); |
85 | int cipher_init(struct sshcipher_ctx *, const struct sshcipher *, | 86 | int cipher_init(struct sshcipher_ctx *, const struct sshcipher *, |
86 | const u_char *, u_int, const u_char *, u_int, int); | 87 | const u_char *, u_int, const u_char *, u_int, int); |
87 | const char* cipher_warning_message(const struct sshcipher_ctx *); | ||
88 | int cipher_crypt(struct sshcipher_ctx *, u_int, u_char *, const u_char *, | 88 | int cipher_crypt(struct sshcipher_ctx *, u_int, u_char *, const u_char *, |
89 | u_int, u_int, u_int); | 89 | u_int, u_int, u_int); |
90 | int cipher_get_length(struct sshcipher_ctx *, u_int *, u_int, | 90 | int cipher_get_length(struct sshcipher_ctx *, u_int *, u_int, |