tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- stevesk@cvs.openbsd.org 2002/01/18 18:14:17 

[authfd.c bufaux.c buffer.c cipher.c packet.c ssh-agent.c ssh-keygen.c]
     unneeded cast cleanup; ok markus@
This commit is contained in:
Damien Miller 2002-01-22 23:33:31 +11:00
parent 9c3f9505d9
commit 4a8ed54361
8 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -204,6 +204,9 @@
- stevesk@cvs.openbsd.org 2002/01/18 17:14:16 - stevesk@cvs.openbsd.org 2002/01/18 17:14:16
[sshd.8] [sshd.8]
correct Ciphers default; paola.mannaro@ubs.com correct Ciphers default; paola.mannaro@ubs.com
- stevesk@cvs.openbsd.org 2002/01/18 18:14:17
[authfd.c bufaux.c buffer.c cipher.c packet.c ssh-agent.c ssh-keygen.c]
unneeded cast cleanup; ok markus@
20020121 20020121
- (djm) Rework ssh-rand-helper: - (djm) Rework ssh-rand-helper:
@ -7351,4 +7354,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1780 2002/01/22 12:33:15 djm Exp $ $Id: ChangeLog,v 1.1781 2002/01/22 12:33:31 djm Exp $

4
authfd.c
View File

@ -35,7 +35,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: authfd.c,v 1.46 2001/12/05 10:06:12 deraadt Exp $"); RCSID("$OpenBSD: authfd.c,v 1.47 2002/01/18 18:14:17 stevesk Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>
@ -344,7 +344,7 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
buffer_put_bignum(&buffer, key->rsa->e); buffer_put_bignum(&buffer, key->rsa->e);
buffer_put_bignum(&buffer, key->rsa->n); buffer_put_bignum(&buffer, key->rsa->n);
buffer_put_bignum(&buffer, challenge); buffer_put_bignum(&buffer, challenge);
buffer_append(&buffer, (char *) session_id, 16); buffer_append(&buffer, session_id, 16);
buffer_put_int(&buffer, response_type); buffer_put_int(&buffer, response_type);
if (ssh_request_reply(auth, &buffer, &buffer) == 0) { if (ssh_request_reply(auth, &buffer, &buffer) == 0) {

6
bufaux.c
View File

@ -37,7 +37,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: bufaux.c,v 1.21 2001/12/28 14:13:13 markus Exp $"); RCSID("$OpenBSD: bufaux.c,v 1.22 2002/01/18 18:14:17 stevesk Exp $");
#include <openssl/bn.h> #include <openssl/bn.h>
#include "bufaux.h" #include "bufaux.h"
@ -90,7 +90,7 @@ buffer_get_bignum(Buffer *buffer, BIGNUM *value)
bytes = (bits + 7) / 8; bytes = (bits + 7) / 8;
if (buffer_len(buffer) < bytes) if (buffer_len(buffer) < bytes)
fatal("buffer_get_bignum: input buffer too small"); fatal("buffer_get_bignum: input buffer too small");
bin = (u_char *) buffer_ptr(buffer); bin = buffer_ptr(buffer);
BN_bin2bn(bin, bytes, value); BN_bin2bn(bin, bytes, value);
buffer_consume(buffer, bytes); buffer_consume(buffer, bytes);
} }
@ -133,7 +133,7 @@ buffer_get_bignum2(Buffer *buffer, BIGNUM *value)
{ {
/**XXX should be two's-complement */ /**XXX should be two's-complement */
int len; int len;
u_char *bin = (u_char *)buffer_get_string(buffer, (u_int *)&len); u_char *bin = buffer_get_string(buffer, (u_int *)&len);
BN_bin2bn(bin, len, value); BN_bin2bn(bin, len, value);
xfree(bin); xfree(bin);
} }

4
buffer.c
View File

@ -12,7 +12,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: buffer.c,v 1.14 2001/12/19 17:16:13 stevesk Exp $"); RCSID("$OpenBSD: buffer.c,v 1.15 2002/01/18 18:14:17 stevesk Exp $");
#include "xmalloc.h" #include "xmalloc.h"
#include "buffer.h" #include "buffer.h"
@ -155,7 +155,7 @@ void
buffer_dump(Buffer *buffer) buffer_dump(Buffer *buffer)
{ {
int i; int i;
u_char *ucp = (u_char *) buffer->buf; u_char *ucp = buffer->buf;
for (i = buffer->offset; i < buffer->end; i++) { for (i = buffer->offset; i < buffer->end; i++) {
fprintf(stderr, "%02x", ucp[i]); fprintf(stderr, "%02x", ucp[i]);

2
cipher.c
View File

@ -35,7 +35,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: cipher.c,v 1.48 2001/12/19 07:18:56 deraadt Exp $"); RCSID("$OpenBSD: cipher.c,v 1.49 2002/01/18 18:14:17 stevesk Exp $");
#include "xmalloc.h" #include "xmalloc.h"
#include "log.h" #include "log.h"

6
packet.c
View File

@ -37,7 +37,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: packet.c,v 1.84 2002/01/11 10:31:05 markus Exp $"); RCSID("$OpenBSD: packet.c,v 1.85 2002/01/18 18:14:17 stevesk Exp $");
#include "xmalloc.h" #include "xmalloc.h"
#include "buffer.h" #include "buffer.h"
@ -130,8 +130,8 @@ packet_set_connection(int fd_in, int fd_out)
fatal("packet_set_connection: cannot load cipher 'none'"); fatal("packet_set_connection: cannot load cipher 'none'");
connection_in = fd_in; connection_in = fd_in;
connection_out = fd_out; connection_out = fd_out;
cipher_init(&send_context, none, (u_char *) "", 0, NULL, 0); cipher_init(&send_context, none, "", 0, NULL, 0);
cipher_init(&receive_context, none, (u_char *) "", 0, NULL, 0); cipher_init(&receive_context, none, "", 0, NULL, 0);
newkeys[MODE_IN] = newkeys[MODE_OUT] = NULL; newkeys[MODE_IN] = newkeys[MODE_OUT] = NULL;
if (!initialized) { if (!initialized) {
initialized = 1; initialized = 1;

6
ssh-agent.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-agent.c,v 1.78 2002/01/13 17:27:07 provos Exp $ */ /* $OpenBSD: ssh-agent.c,v 1.79 2002/01/18 18:14:17 stevesk Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -37,7 +37,7 @@
#include "includes.h" #include "includes.h"
#include <sys/queue.h> #include <sys/queue.h>
RCSID("$OpenBSD: ssh-agent.c,v 1.78 2002/01/13 17:27:07 provos Exp $"); RCSID("$OpenBSD: ssh-agent.c,v 1.79 2002/01/18 18:14:17 stevesk Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/md5.h> #include <openssl/md5.h>
@ -205,7 +205,7 @@ process_authentication_challenge1(SocketEntry *e)
/* Only protocol 1.1 is supported */ /* Only protocol 1.1 is supported */
if (buffer_len(&e->input) == 0) if (buffer_len(&e->input) == 0)
goto failure; goto failure;
buffer_get(&e->input, (char *) session_id, 16); buffer_get(&e->input, session_id, 16);
response_type = buffer_get_int(&e->input); response_type = buffer_get_int(&e->input);
if (response_type != 1) if (response_type != 1)
goto failure; goto failure;

4
ssh-keygen.c
View File

@ -12,7 +12,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: ssh-keygen.c,v 1.90 2002/01/09 13:49:27 markus Exp $"); RCSID("$OpenBSD: ssh-keygen.c,v 1.91 2002/01/18 18:14:17 stevesk Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/pem.h> #include <openssl/pem.h>
@ -332,7 +332,7 @@ do_convert_from_ssh2(struct passwd *pw)
*p = '\0'; *p = '\0';
strlcat(encoded, line, sizeof(encoded)); strlcat(encoded, line, sizeof(encoded));
} }
blen = uudecode(encoded, (u_char *)blob, sizeof(blob)); blen = uudecode(encoded, blob, sizeof(blob));
if (blen < 0) { if (blen < 0) {
fprintf(stderr, "uudecode failed.\n"); fprintf(stderr, "uudecode failed.\n");
exit(1); exit(1);