[authfile.c channels.c compress.c packet.c sftp-server.c ssh-agent.c ssh-keygen.c]
remove unneeded casts and some char->u_char cleanup; ok markus@
- stevesk@cvs.openbsd.org 2001/12/28 22:37:48
[ssh.1 sshd.8]
document LogLevel DEBUG[123]; ok markus@
- stevesk@cvs.openbsd.org 2001/12/28 22:37:48
[ssh.1 sshd.8]
document LogLevel DEBUG[123]; ok markus@
+ - stevesk@cvs.openbsd.org 2001/12/29 21:56:01
+ [authfile.c channels.c compress.c packet.c sftp-server.c]
+ [ssh-agent.c ssh-keygen.c]
+ remove unneeded casts and some char->u_char cleanup; ok markus@
-RCSID("$OpenBSD: authfile.c,v 1.44 2001/12/27 18:26:13 markus Exp $");
+RCSID("$OpenBSD: authfile.c,v 1.45 2001/12/29 21:56:01 stevesk Exp $");
#include <openssl/err.h>
#include <openssl/evp.h>
#include <openssl/err.h>
#include <openssl/evp.h>
const char *comment)
{
Buffer buffer, encrypted;
const char *comment)
{
Buffer buffer, encrypted;
int fd, i;
CipherContext ciphercontext;
Cipher *cipher;
int fd, i;
CipherContext ciphercontext;
Cipher *cipher;
cp = buffer_append_space(&encrypted, buffer_len(&buffer));
cipher_set_key_string(&ciphercontext, cipher, passphrase);
cp = buffer_append_space(&encrypted, buffer_len(&buffer));
cipher_set_key_string(&ciphercontext, cipher, passphrase);
- cipher_encrypt(&ciphercontext, (u_char *) cp,
- (u_char *) buffer_ptr(&buffer), buffer_len(&buffer));
+ cipher_encrypt(&ciphercontext, cp,
+ buffer_ptr(&buffer), buffer_len(&buffer));
memset(&ciphercontext, 0, sizeof(ciphercontext));
/* Destroy temporary data. */
memset(&ciphercontext, 0, sizeof(ciphercontext));
/* Destroy temporary data. */
int i, check1, check2, cipher_type;
off_t len;
Buffer buffer, decrypted;
int i, check1, check2, cipher_type;
off_t len;
Buffer buffer, decrypted;
CipherContext ciphercontext;
Cipher *cipher;
Key *prv = NULL;
CipherContext ciphercontext;
Cipher *cipher;
Key *prv = NULL;
/* Rest of the buffer is encrypted. Decrypt it using the passphrase. */
cipher_set_key_string(&ciphercontext, cipher, passphrase);
/* Rest of the buffer is encrypted. Decrypt it using the passphrase. */
cipher_set_key_string(&ciphercontext, cipher, passphrase);
- cipher_decrypt(&ciphercontext, (u_char *) cp,
- (u_char *) buffer_ptr(&buffer), buffer_len(&buffer));
+ cipher_decrypt(&ciphercontext, cp,
+ buffer_ptr(&buffer), buffer_len(&buffer));
memset(&ciphercontext, 0, sizeof(ciphercontext));
buffer_free(&buffer);
memset(&ciphercontext, 0, sizeof(ciphercontext));
buffer_free(&buffer);
-RCSID("$OpenBSD: channels.c,v 1.154 2001/12/28 15:06:00 markus Exp $");
+RCSID("$OpenBSD: channels.c,v 1.155 2001/12/29 21:56:01 stevesk Exp $");
#include "ssh.h"
#include "ssh1.h"
#include "ssh.h"
#include "ssh1.h"
return 0;
/* Parse the lengths of variable-length fields. */
return 0;
/* Parse the lengths of variable-length fields. */
- ucp = (u_char *) buffer_ptr(b);
if (ucp[0] == 0x42) { /* Byte order MSB first. */
proto_len = 256 * ucp[6] + ucp[7];
data_len = 256 * ucp[8] + ucp[9];
if (ucp[0] == 0x42) { /* Byte order MSB first. */
proto_len = 256 * ucp[6] + ucp[7];
data_len = 256 * ucp[8] + ucp[9];
-RCSID("$OpenBSD: compress.c,v 1.16 2001/12/19 07:18:56 deraadt Exp $");
+RCSID("$OpenBSD: compress.c,v 1.17 2001/12/29 21:56:01 stevesk Exp $");
#include "log.h"
#include "buffer.h"
#include "log.h"
#include "buffer.h"
void
buffer_compress(Buffer * input_buffer, Buffer * output_buffer)
{
void
buffer_compress(Buffer * input_buffer, Buffer * output_buffer)
{
int status;
/* This case is not handled below. */
int status;
/* This case is not handled below. */
return;
/* Input is the contents of the input buffer. */
return;
/* Input is the contents of the input buffer. */
- outgoing_stream.next_in = (u_char *) buffer_ptr(input_buffer);
+ outgoing_stream.next_in = buffer_ptr(input_buffer);
outgoing_stream.avail_in = buffer_len(input_buffer);
/* Loop compressing until deflate() returns with avail_out != 0. */
do {
/* Set up fixed-size output buffer. */
outgoing_stream.avail_in = buffer_len(input_buffer);
/* Loop compressing until deflate() returns with avail_out != 0. */
do {
/* Set up fixed-size output buffer. */
- outgoing_stream.next_out = (u_char *)buf;
+ outgoing_stream.next_out = buf;
outgoing_stream.avail_out = sizeof(buf);
/* Compress as much data into the buffer as possible. */
outgoing_stream.avail_out = sizeof(buf);
/* Compress as much data into the buffer as possible. */
void
buffer_uncompress(Buffer * input_buffer, Buffer * output_buffer)
{
void
buffer_uncompress(Buffer * input_buffer, Buffer * output_buffer)
{
- incoming_stream.next_in = (u_char *) buffer_ptr(input_buffer);
+ incoming_stream.next_in = buffer_ptr(input_buffer);
incoming_stream.avail_in = buffer_len(input_buffer);
for (;;) {
/* Set up fixed-size output buffer. */
incoming_stream.avail_in = buffer_len(input_buffer);
for (;;) {
/* Set up fixed-size output buffer. */
- incoming_stream.next_out = (u_char *) buf;
+ incoming_stream.next_out = buf;
incoming_stream.avail_out = sizeof(buf);
status = inflate(&incoming_stream, Z_PARTIAL_FLUSH);
incoming_stream.avail_out = sizeof(buf);
status = inflate(&incoming_stream, Z_PARTIAL_FLUSH);
-RCSID("$OpenBSD: packet.c,v 1.82 2001/12/28 14:50:54 markus Exp $");
+RCSID("$OpenBSD: packet.c,v 1.83 2001/12/29 21:56:01 stevesk Exp $");
#include "xmalloc.h"
#include "buffer.h"
#include "xmalloc.h"
#include "buffer.h"
buffer_consume(&outgoing_packet, 8 - padding);
/* Add check bytes. */
buffer_consume(&outgoing_packet, 8 - padding);
/* Add check bytes. */
- checksum = ssh_crc32((u_char *) buffer_ptr(&outgoing_packet),
+ checksum = ssh_crc32(buffer_ptr(&outgoing_packet),
buffer_len(&outgoing_packet));
PUT_32BIT(buf, checksum);
buffer_append(&outgoing_packet, buf, 4);
buffer_len(&outgoing_packet));
PUT_32BIT(buf, checksum);
buffer_append(&outgoing_packet, buf, 4);
}
block_size = enc ? enc->cipher->block_size : 8;
}
block_size = enc ? enc->cipher->block_size : 8;
- ucp = (u_char *) buffer_ptr(&outgoing_packet);
+ ucp = buffer_ptr(&outgoing_packet);
type = ucp[5];
#ifdef PACKET_DEBUG
type = ucp[5];
#ifdef PACKET_DEBUG
}
/* packet_length includes payload, padding and padding length field */
packet_length = buffer_len(&outgoing_packet) - 4;
}
/* packet_length includes payload, padding and padding length field */
packet_length = buffer_len(&outgoing_packet) - 4;
- ucp = (u_char *)buffer_ptr(&outgoing_packet);
+ ucp = buffer_ptr(&outgoing_packet);
PUT_32BIT(ucp, packet_length);
ucp[4] = padlen;
DBG(debug("send: len %d (includes padlen %d)", packet_length+4, padlen));
PUT_32BIT(ucp, packet_length);
ucp[4] = padlen;
DBG(debug("send: len %d (includes padlen %d)", packet_length+4, padlen));
/* compute MAC over seqnr and packet(length fields, payload, padding) */
if (mac && mac->enabled) {
macbuf = mac_compute(mac, seqnr,
/* compute MAC over seqnr and packet(length fields, payload, padding) */
if (mac && mac->enabled) {
macbuf = mac_compute(mac, seqnr,
- (u_char *) buffer_ptr(&outgoing_packet),
+ buffer_ptr(&outgoing_packet),
buffer_len(&outgoing_packet));
DBG(debug("done calc MAC out #%d", seqnr));
}
buffer_len(&outgoing_packet));
DBG(debug("done calc MAC out #%d", seqnr));
}
if (buffer_len(&input) < 4 + 8)
return SSH_MSG_NONE;
/* Get length of incoming packet. */
if (buffer_len(&input) < 4 + 8)
return SSH_MSG_NONE;
/* Get length of incoming packet. */
- ucp = (u_char *) buffer_ptr(&input);
+ ucp = buffer_ptr(&input);
len = GET_32BIT(ucp);
if (len < 1 + 2 + 2 || len > 256 * 1024)
packet_disconnect("Bad packet length %d.", len);
len = GET_32BIT(ucp);
if (len < 1 + 2 + 2 || len > 256 * 1024)
packet_disconnect("Bad packet length %d.", len);
#endif
/* Compute packet checksum. */
#endif
/* Compute packet checksum. */
- checksum = ssh_crc32((u_char *) buffer_ptr(&incoming_packet),
+ checksum = ssh_crc32(buffer_ptr(&incoming_packet),
buffer_len(&incoming_packet) - 4);
/* Skip padding. */
buffer_len(&incoming_packet) - 4);
/* Skip padding. */
packet_disconnect("packet_read_poll1: len %d != buffer_len %d.",
len, buffer_len(&incoming_packet));
packet_disconnect("packet_read_poll1: len %d != buffer_len %d.",
len, buffer_len(&incoming_packet));
- ucp = (u_char *) buffer_ptr(&incoming_packet) + len - 4;
+ ucp = (u_char *)buffer_ptr(&incoming_packet) + len - 4;
stored_checksum = GET_32BIT(ucp);
if (checksum != stored_checksum)
packet_disconnect("Corrupted check bytes on input.");
stored_checksum = GET_32BIT(ucp);
if (checksum != stored_checksum)
packet_disconnect("Corrupted check bytes on input.");
cp = buffer_append_space(&incoming_packet, block_size);
cipher_decrypt(&receive_context, cp, buffer_ptr(&input),
block_size);
cp = buffer_append_space(&incoming_packet, block_size);
cipher_decrypt(&receive_context, cp, buffer_ptr(&input),
block_size);
- ucp = (u_char *) buffer_ptr(&incoming_packet);
+ ucp = buffer_ptr(&incoming_packet);
packet_length = GET_32BIT(ucp);
if (packet_length < 1 + 4 || packet_length > 256 * 1024) {
buffer_dump(&incoming_packet);
packet_length = GET_32BIT(ucp);
if (packet_length < 1 + 4 || packet_length > 256 * 1024) {
buffer_dump(&incoming_packet);
*/
if (mac && mac->enabled) {
macbuf = mac_compute(mac, seqnr,
*/
if (mac && mac->enabled) {
macbuf = mac_compute(mac, seqnr,
- (u_char *) buffer_ptr(&incoming_packet),
+ buffer_ptr(&incoming_packet),
buffer_len(&incoming_packet));
if (memcmp(macbuf, buffer_ptr(&input), mac->mac_len) != 0)
packet_disconnect("Corrupted MAC on input.");
buffer_len(&incoming_packet));
if (memcmp(macbuf, buffer_ptr(&input), mac->mac_len) != 0)
packet_disconnect("Corrupted MAC on input.");
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "includes.h"
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "includes.h"
-RCSID("$OpenBSD: sftp-server.c,v 1.31 2001/12/19 07:18:56 deraadt Exp $");
+RCSID("$OpenBSD: sftp-server.c,v 1.32 2001/12/29 21:56:01 stevesk Exp $");
#include "buffer.h"
#include "bufaux.h"
#include "buffer.h"
#include "bufaux.h"
if (buffer_len(&iqueue) < 5)
return; /* Incomplete message. */
if (buffer_len(&iqueue) < 5)
return; /* Incomplete message. */
- cp = (u_char *) buffer_ptr(&iqueue);
+ cp = buffer_ptr(&iqueue);
msg_len = GET_32BIT(cp);
if (msg_len > 256 * 1024) {
error("bad message ");
msg_len = GET_32BIT(cp);
if (msg_len > 256 * 1024) {
error("bad message ");
-/* $OpenBSD: ssh-agent.c,v 1.76 2001/12/27 18:22:16 markus Exp $ */
+/* $OpenBSD: ssh-agent.c,v 1.77 2001/12/29 21:56:01 stevesk Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
-RCSID("$OpenBSD: ssh-agent.c,v 1.76 2001/12/27 18:22:16 markus Exp $");
+RCSID("$OpenBSD: ssh-agent.c,v 1.77 2001/12/29 21:56:01 stevesk Exp $");
#include <openssl/evp.h>
#include <openssl/md5.h>
#include <openssl/evp.h>
#include <openssl/md5.h>
u_char *cp;
if (buffer_len(&e->input) < 5)
return; /* Incomplete message. */
u_char *cp;
if (buffer_len(&e->input) < 5)
return; /* Incomplete message. */
- cp = (u_char *) buffer_ptr(&e->input);
+ cp = buffer_ptr(&e->input);
msg_len = GET_32BIT(cp);
if (msg_len > 256 * 1024) {
shutdown(e->fd, SHUT_RDWR);
msg_len = GET_32BIT(cp);
if (msg_len > 256 * 1024) {
shutdown(e->fd, SHUT_RDWR);
-RCSID("$OpenBSD: ssh-keygen.c,v 1.88 2001/12/27 18:10:29 markus Exp $");
+RCSID("$OpenBSD: ssh-keygen.c,v 1.89 2001/12/29 21:56:01 stevesk Exp $");
#include <openssl/evp.h>
#include <openssl/pem.h>
#include <openssl/evp.h>
#include <openssl/pem.h>
if (buffer_len(b) < bytes)
fatal("buffer_get_bignum_bits: input buffer too small: "
"need %d have %d", bytes, buffer_len(b));
if (buffer_len(b) < bytes)
fatal("buffer_get_bignum_bits: input buffer too small: "
"need %d have %d", bytes, buffer_len(b));
- BN_bin2bn((u_char *)buffer_ptr(b), bytes, value);
+ BN_bin2bn(buffer_ptr(b), bytes, value);
buffer_consume(b, bytes);
}
buffer_consume(b, bytes);
}