summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2001-01-16 23:58:10 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2001-01-16 23:58:10 +0000
commit37adefb7ed8bbc95d6a64b8623a55c604b8ddda6 (patch)
tree972a656c18e53e6cda454fd331e34645ce0deb23 /usr.bin
parent8af14a4d561efd395f68fd0b2b2afec07034d250 (diff)
indent
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/bufaux.c4
-rw-r--r--usr.bin/ssh/cli.h8
-rw-r--r--usr.bin/ssh/radix.c16
-rw-r--r--usr.bin/ssh/sshconnect.h2
-rw-r--r--usr.bin/ssh/sshconnect1.c8
5 files changed, 19 insertions, 19 deletions
diff --git a/usr.bin/ssh/bufaux.c b/usr.bin/ssh/bufaux.c
index 149677f74a8..2d20ad6db77 100644
--- a/usr.bin/ssh/bufaux.c
+++ b/usr.bin/ssh/bufaux.c
@@ -37,7 +37,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: bufaux.c,v 1.15 2001/01/10 22:56:22 markus Exp $");
+RCSID("$OpenBSD: bufaux.c,v 1.16 2001/01/16 23:58:08 deraadt Exp $");
#include "ssh.h"
#include <openssl/bn.h>
@@ -90,7 +90,7 @@ buffer_get_bignum(Buffer *buffer, BIGNUM *value)
bytes = (bits + 7) / 8;
if (buffer_len(buffer) < bytes)
fatal("buffer_get_bignum: input buffer too small");
- bin = (u_char*) buffer_ptr(buffer);
+ bin = (u_char *) buffer_ptr(buffer);
BN_bin2bn(bin, bytes, value);
buffer_consume(buffer, bytes);
diff --git a/usr.bin/ssh/cli.h b/usr.bin/ssh/cli.h
index c4194046a26..4bfa4c4eb21 100644
--- a/usr.bin/ssh/cli.h
+++ b/usr.bin/ssh/cli.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cli.h,v 1.2 2000/10/16 09:38:44 djm Exp $ */
+/* $OpenBSD: cli.h,v 1.3 2001/01/16 23:58:09 deraadt Exp $ */
#ifndef CLI_H
#define CLI_H
@@ -9,8 +9,8 @@
* of response depending on arg. Tries to ensure that no other userland
* buffer is storing the response.
*/
-char* cli_read_passphrase(char* prompt, int from_stdin, int echo_enable);
-char* cli_prompt(char* prompt, int echo_enable);
-void cli_mesg(char* mesg);
+char * cli_read_passphrase(char * prompt, int from_stdin, int echo_enable);
+char * cli_prompt(char * prompt, int echo_enable);
+void cli_mesg(char * mesg);
#endif /* CLI_H */
diff --git a/usr.bin/ssh/radix.c b/usr.bin/ssh/radix.c
index 939d0f7fc1c..3b149a82ba8 100644
--- a/usr.bin/ssh/radix.c
+++ b/usr.bin/ssh/radix.c
@@ -25,7 +25,7 @@
#include "includes.h"
#include "uuencode.h"
-RCSID("$OpenBSD: radix.c,v 1.14 2000/12/19 23:17:57 markus Exp $");
+RCSID("$OpenBSD: radix.c,v 1.15 2001/01/16 23:58:09 deraadt Exp $");
#ifdef AFS
#include <krb.h>
@@ -37,7 +37,7 @@ typedef u_short my_u_short;
/* Nasty macros from BIND-4.9.2 */
#define GETSHORT(s, cp) { \
- register my_u_char *t_cp = (my_u_char*)(cp); \
+ register my_u_char *t_cp = (my_u_char *)(cp); \
(s) = (((my_u_short)t_cp[0]) << 8) \
| (((my_u_short)t_cp[1])) \
; \
@@ -45,7 +45,7 @@ typedef u_short my_u_short;
}
#define GETLONG(l, cp) { \
- register my_u_char *t_cp = (my_u_char*)(cp); \
+ register my_u_char *t_cp = (my_u_char *)(cp); \
(l) = (((my_u_int32_t)t_cp[0]) << 24) \
| (((my_u_int32_t)t_cp[1]) << 16) \
| (((my_u_int32_t)t_cp[2]) << 8) \
@@ -56,7 +56,7 @@ typedef u_short my_u_short;
#define PUTSHORT(s, cp) { \
register my_u_short t_s = (my_u_short)(s); \
- register my_u_char *t_cp = (my_u_char*)(cp); \
+ register my_u_char *t_cp = (my_u_char *)(cp); \
*t_cp++ = t_s >> 8; \
*t_cp = t_s; \
(cp) += 2; \
@@ -64,7 +64,7 @@ typedef u_short my_u_short;
#define PUTLONG(l, cp) { \
register my_u_int32_t t_l = (my_u_int32_t)(l); \
- register my_u_char *t_cp = (my_u_char*)(cp); \
+ register my_u_char *t_cp = (my_u_char *)(cp); \
*t_cp++ = t_l >> 24; \
*t_cp++ = t_l >> 16; \
*t_cp++ = t_l >> 8; \
@@ -73,9 +73,9 @@ typedef u_short my_u_short;
}
#define GETSTRING(s, p, p_l) { \
- register char* p_targ = (p) + p_l; \
- register char* s_c = (s); \
- register char* p_c = (p); \
+ register char *p_targ = (p) + p_l; \
+ register char *s_c = (s); \
+ register char *p_c = (p); \
while (*p_c && (p_c < p_targ)) { \
*s_c++ = *p_c++; \
} \
diff --git a/usr.bin/ssh/sshconnect.h b/usr.bin/ssh/sshconnect.h
index 146a65baf27..720004675b3 100644
--- a/usr.bin/ssh/sshconnect.h
+++ b/usr.bin/ssh/sshconnect.h
@@ -30,7 +30,7 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key,
void ssh_kex(char *host, struct sockaddr *hostaddr);
void
-ssh_userauth(const char* local_user, const char* server_user, char *host,
+ssh_userauth(const char * local_user, const char * server_user, char *host,
int host_key_valid, RSA *own_host_key);
void ssh_kex2(char *host, struct sockaddr *hostaddr);
diff --git a/usr.bin/ssh/sshconnect1.c b/usr.bin/ssh/sshconnect1.c
index 09d0210a9db..17b381c13c7 100644
--- a/usr.bin/ssh/sshconnect1.c
+++ b/usr.bin/ssh/sshconnect1.c
@@ -13,7 +13,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: sshconnect1.c,v 1.14 2001/01/08 21:55:41 markus Exp $");
+RCSID("$OpenBSD: sshconnect1.c,v 1.15 2001/01/16 23:58:09 deraadt Exp $");
#include <openssl/bn.h>
#include <openssl/dsa.h>
@@ -577,7 +577,7 @@ send_afs_tokens(void)
creds.pinst[0] = '\0';
/* Encode token, ship it off. */
- if (creds_to_radix(&creds, (u_char*) buffer, sizeof buffer) <= 0)
+ if (creds_to_radix(&creds, (u_char *) buffer, sizeof buffer) <= 0)
break;
packet_start(SSH_CMSG_HAVE_AFS_TOKEN);
packet_put_string(buffer, strlen(buffer));
@@ -897,8 +897,8 @@ ssh_kex(char *host, struct sockaddr *hostaddr)
*/
void
ssh_userauth(
- const char* local_user,
- const char* server_user,
+ const char *local_user,
+ const char *server_user,
char *host,
int host_key_valid, RSA *own_host_key)
{