diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | cipher.c | 16 | ||||
-rw-r--r-- | kex.h | 4 | ||||
-rw-r--r-- | mac.c | 4 |
4 files changed, 16 insertions, 13 deletions
@@ -3,6 +3,9 @@ | |||
3 | - markus@cvs.openbsd.org 2002/05/15 21:56:38 | 3 | - markus@cvs.openbsd.org 2002/05/15 21:56:38 |
4 | [servconf.c sshd.8 sshd_config] | 4 | [servconf.c sshd.8 sshd_config] |
5 | re-enable privsep and disable setuid for post-3.2.2 | 5 | re-enable privsep and disable setuid for post-3.2.2 |
6 | - markus@cvs.openbsd.org 2002/05/16 22:02:50 | ||
7 | [cipher.c kex.h mac.c] | ||
8 | fix warnings (openssl 0.9.7 requires const) | ||
6 | 9 | ||
7 | 20020604 | 10 | 20020604 |
8 | - (stevesk) [channels.c] bug #164 patch from YOSHIFUJI Hideaki (changed | 11 | - (stevesk) [channels.c] bug #164 patch from YOSHIFUJI Hideaki (changed |
@@ -687,4 +690,4 @@ | |||
687 | - (stevesk) entropy.c: typo in debug message | 690 | - (stevesk) entropy.c: typo in debug message |
688 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ | 691 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ |
689 | 692 | ||
690 | $Id: ChangeLog,v 1.2144 2002/06/06 19:47:11 mouring Exp $ | 693 | $Id: ChangeLog,v 1.2145 2002/06/06 19:48:16 mouring Exp $ |
@@ -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; |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kex.h,v 1.30 2002/03/18 17:50:31 provos Exp $ */ | 1 | /* $OpenBSD: kex.h,v 1.31 2002/05/16 22:02:50 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
@@ -79,7 +79,7 @@ struct Enc { | |||
79 | struct Mac { | 79 | struct Mac { |
80 | char *name; | 80 | char *name; |
81 | int enabled; | 81 | int enabled; |
82 | EVP_MD *md; | 82 | const EVP_MD *md; |
83 | int mac_len; | 83 | int mac_len; |
84 | u_char *key; | 84 | u_char *key; |
85 | int key_len; | 85 | int key_len; |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: mac.c,v 1.4 2002/01/25 22:07:40 markus Exp $"); | 26 | RCSID("$OpenBSD: mac.c,v 1.5 2002/05/16 22:02:50 markus Exp $"); |
27 | 27 | ||
28 | #include <openssl/hmac.h> | 28 | #include <openssl/hmac.h> |
29 | 29 | ||
@@ -36,7 +36,7 @@ RCSID("$OpenBSD: mac.c,v 1.4 2002/01/25 22:07:40 markus Exp $"); | |||
36 | 36 | ||
37 | struct { | 37 | struct { |
38 | char *name; | 38 | char *name; |
39 | EVP_MD * (*mdfunc)(void); | 39 | const EVP_MD * (*mdfunc)(void); |
40 | int truncatebits; /* truncate digest if != 0 */ | 40 | int truncatebits; /* truncate digest if != 0 */ |
41 | } macs[] = { | 41 | } macs[] = { |
42 | { "hmac-sha1", EVP_sha1, 0, }, | 42 | { "hmac-sha1", EVP_sha1, 0, }, |