diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2002-06-06 19:48:16 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2002-06-06 19:48:16 +0000 |
commit | 6a2464136520a36be29fc64ebcf39ab59a599fad (patch) | |
tree | 078077246a8a8b24b8c19f63b45b687afb5b3378 /cipher.c | |
parent | fb62a6948834281fd5628e5566f17c1767a17763 (diff) |
- markus@cvs.openbsd.org 2002/05/16 22:02:50
[cipher.c kex.h mac.c]
fix warnings (openssl 0.9.7 requires const)
Diffstat (limited to 'cipher.c')
-rw-r--r-- | cipher.c | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -35,7 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: cipher.c,v 1.55 2002/04/03 09:26:11 markus Exp $"); | 38 | RCSID("$OpenBSD: cipher.c,v 1.56 2002/05/16 22:02:50 markus Exp $"); |
39 | 39 | ||
40 | #include "xmalloc.h" | 40 | #include "xmalloc.h" |
41 | #include "log.h" | 41 | #include "log.h" |
@@ -49,16 +49,16 @@ RCSID("$OpenBSD: cipher.c,v 1.55 2002/04/03 09:26:11 markus Exp $"); | |||
49 | #define EVP_CIPHER_CTX_get_app_data(e) ((e)->app_data) | 49 | #define EVP_CIPHER_CTX_get_app_data(e) ((e)->app_data) |
50 | #endif | 50 | #endif |
51 | 51 | ||
52 | static EVP_CIPHER *evp_ssh1_3des(void); | 52 | static const EVP_CIPHER *evp_ssh1_3des(void); |
53 | static EVP_CIPHER *evp_ssh1_bf(void); | 53 | static const EVP_CIPHER *evp_ssh1_bf(void); |
54 | static EVP_CIPHER *evp_rijndael(void); | 54 | static const EVP_CIPHER *evp_rijndael(void); |
55 | 55 | ||
56 | struct Cipher { | 56 | struct Cipher { |
57 | char *name; | 57 | char *name; |
58 | int number; /* for ssh1 only */ | 58 | int number; /* for ssh1 only */ |
59 | u_int block_size; | 59 | u_int block_size; |
60 | u_int key_len; | 60 | u_int key_len; |
61 | EVP_CIPHER *(*evptype)(void); | 61 | const EVP_CIPHER *(*evptype)(void); |
62 | } ciphers[] = { | 62 | } ciphers[] = { |
63 | { "none", SSH_CIPHER_NONE, 8, 0, EVP_enc_null }, | 63 | { "none", SSH_CIPHER_NONE, 8, 0, EVP_enc_null }, |
64 | { "des", SSH_CIPHER_DES, 8, 8, EVP_des_cbc }, | 64 | { "des", SSH_CIPHER_DES, 8, 8, EVP_des_cbc }, |
@@ -379,7 +379,7 @@ ssh1_3des_cleanup(EVP_CIPHER_CTX *ctx) | |||
379 | } | 379 | } |
380 | return (1); | 380 | return (1); |
381 | } | 381 | } |
382 | static EVP_CIPHER * | 382 | static const EVP_CIPHER * |
383 | evp_ssh1_3des(void) | 383 | evp_ssh1_3des(void) |
384 | { | 384 | { |
385 | static EVP_CIPHER ssh1_3des; | 385 | static EVP_CIPHER ssh1_3des; |
@@ -431,7 +431,7 @@ bf_ssh1_cipher(EVP_CIPHER_CTX *ctx, u_char *out, const u_char *in, u_int len) | |||
431 | swap_bytes(out, out, len); | 431 | swap_bytes(out, out, len); |
432 | return (ret); | 432 | return (ret); |
433 | } | 433 | } |
434 | static EVP_CIPHER * | 434 | static const EVP_CIPHER * |
435 | evp_ssh1_bf(void) | 435 | evp_ssh1_bf(void) |
436 | { | 436 | { |
437 | static EVP_CIPHER ssh1_bf; | 437 | static EVP_CIPHER ssh1_bf; |
@@ -529,7 +529,7 @@ ssh_rijndael_cleanup(EVP_CIPHER_CTX *ctx) | |||
529 | } | 529 | } |
530 | return (1); | 530 | return (1); |
531 | } | 531 | } |
532 | static EVP_CIPHER * | 532 | static const EVP_CIPHER * |
533 | evp_rijndael(void) | 533 | evp_rijndael(void) |
534 | { | 534 | { |
535 | static EVP_CIPHER rijndal_cbc; | 535 | static EVP_CIPHER rijndal_cbc; |