mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-12-22 10:00:14 +00:00
bf555ba621
NEED TO BE GENERATED* =) Refer to to entry "2001/01/16 19:20:06" for more details. 20010118 - (bal) Super Sized OpenBSD Resync - markus@cvs.openbsd.org 2001/01/11 22:14:20 GMT 2001 by markus [sshd.c] maxfd+1 - markus@cvs.openbsd.org 2001/01/13 17:59:18 [ssh-keygen.1] small ssh-keygen manpage cleanup; stevesk@pobox.com - markus@cvs.openbsd.org 2001/01/13 18:03:07 [scp.c ssh-keygen.c sshd.c] getopt() returns -1 not EOF; stevesk@pobox.com - markus@cvs.openbsd.org 2001/01/13 18:06:54 [ssh-keyscan.c] use SSH_DEFAULT_PORT; from stevesk@pobox.com - markus@cvs.openbsd.org 2001/01/13 18:12:47 [ssh-keyscan.c] free() -> xfree(); fix memory leak; from stevesk@pobox.com - markus@cvs.openbsd.org 2001/01/13 18:14:13 [ssh-add.c] typo, from stevesk@sweden.hp.com - markus@cvs.openbsd.org 2001/01/13 18:32:50 [packet.c session.c ssh.c sshconnect.c sshd.c] split out keepalive from packet_interactive (from dale@accentre.com) set IPTOS_LOWDELAY TCP_NODELAY IPTOS_THROUGHPUT for ssh2, too. - markus@cvs.openbsd.org 2001/01/13 18:36:45 [packet.c packet.h] reorder, typo - markus@cvs.openbsd.org 2001/01/13 18:38:00 [auth-options.c] fix comment - markus@cvs.openbsd.org 2001/01/13 18:43:31 [session.c] Wall - markus@cvs.openbsd.org 2001/01/13 19:14:08 [clientloop.h clientloop.c ssh.c] move callback to headerfile - markus@cvs.openbsd.org 2001/01/15 21:40:10 [ssh.c] use log() instead of stderr - markus@cvs.openbsd.org 2001/01/15 21:43:51 [dh.c] use error() not stderr! - markus@cvs.openbsd.org 2001/01/15 21:45:29 [sftp-server.c] rename must fail if newpath exists, debug off by default - markus@cvs.openbsd.org 2001/01/15 21:46:38 [sftp-server.c] readable long listing for sftp-server, ok deraadt@ - markus@cvs.openbsd.org 2001/01/16 19:20:06 [key.c ssh-rsa.c] make "ssh-rsa" key format for ssh2 confirm to the ietf-drafts; from galb@vandyke.com. note that you have to delete older ssh2-rsa keys, since they are in the wrong format, too. they must be removed from .ssh/authorized_keys2 and .ssh/known_hosts2, etc. (cd; grep -v ssh-rsa .ssh/authorized_keys2 > TMP && mv TMP .ssh/authorized_keys2) additionally, we now check that BN_num_bits(rsa->n) >= 768. - markus@cvs.openbsd.org 2001/01/16 20:54:27 [sftp-server.c] remove some statics. simpler handles; idea from nisse@lysator.liu.se - deraadt@cvs.openbsd.org 2001/01/16 23:58:08 [bufaux.c radix.c sshconnect.h sshconnect1.c] indent - (bal) Added bsd-strmode.[ch] since some non-OpenBSD platforms may be missing such feature.
213 lines
4.9 KiB
C
213 lines
4.9 KiB
C
/*
|
|
* Copyright (c) 1999 Dug Song. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include "includes.h"
|
|
#include "uuencode.h"
|
|
|
|
RCSID("$OpenBSD: radix.c,v 1.15 2001/01/16 23:58:09 deraadt Exp $");
|
|
|
|
#ifdef AFS
|
|
#include <krb.h>
|
|
|
|
typedef u_char my_u_char;
|
|
typedef u_int my_u_int32_t;
|
|
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); \
|
|
(s) = (((my_u_short)t_cp[0]) << 8) \
|
|
| (((my_u_short)t_cp[1])) \
|
|
; \
|
|
(cp) += 2; \
|
|
}
|
|
|
|
#define GETLONG(l, 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) \
|
|
| (((my_u_int32_t)t_cp[3])) \
|
|
; \
|
|
(cp) += 4; \
|
|
}
|
|
|
|
#define PUTSHORT(s, cp) { \
|
|
register my_u_short t_s = (my_u_short)(s); \
|
|
register my_u_char *t_cp = (my_u_char *)(cp); \
|
|
*t_cp++ = t_s >> 8; \
|
|
*t_cp = t_s; \
|
|
(cp) += 2; \
|
|
}
|
|
|
|
#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); \
|
|
*t_cp++ = t_l >> 24; \
|
|
*t_cp++ = t_l >> 16; \
|
|
*t_cp++ = t_l >> 8; \
|
|
*t_cp = t_l; \
|
|
(cp) += 4; \
|
|
}
|
|
|
|
#define GETSTRING(s, p, p_l) { \
|
|
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++; \
|
|
} \
|
|
if (p_c == p_targ) { \
|
|
return 1; \
|
|
} \
|
|
*s_c = *p_c++; \
|
|
(p_l) = (p_l) - (p_c - (p)); \
|
|
(p) = p_c; \
|
|
}
|
|
|
|
|
|
int
|
|
creds_to_radix(CREDENTIALS *creds, u_char *buf, size_t buflen)
|
|
{
|
|
char *p, *s;
|
|
int len;
|
|
char temp[2048];
|
|
|
|
p = temp;
|
|
*p++ = 1; /* version */
|
|
s = creds->service;
|
|
while (*s)
|
|
*p++ = *s++;
|
|
*p++ = *s;
|
|
s = creds->instance;
|
|
while (*s)
|
|
*p++ = *s++;
|
|
*p++ = *s;
|
|
s = creds->realm;
|
|
while (*s)
|
|
*p++ = *s++;
|
|
*p++ = *s;
|
|
|
|
s = creds->pname;
|
|
while (*s)
|
|
*p++ = *s++;
|
|
*p++ = *s;
|
|
s = creds->pinst;
|
|
while (*s)
|
|
*p++ = *s++;
|
|
*p++ = *s;
|
|
/* Null string to repeat the realm. */
|
|
*p++ = '\0';
|
|
|
|
PUTLONG(creds->issue_date, p);
|
|
{
|
|
u_int endTime;
|
|
endTime = (u_int) krb_life_to_time(creds->issue_date,
|
|
creds->lifetime);
|
|
PUTLONG(endTime, p);
|
|
}
|
|
|
|
memcpy(p, &creds->session, sizeof(creds->session));
|
|
p += sizeof(creds->session);
|
|
|
|
PUTSHORT(creds->kvno, p);
|
|
PUTLONG(creds->ticket_st.length, p);
|
|
|
|
memcpy(p, creds->ticket_st.dat, creds->ticket_st.length);
|
|
p += creds->ticket_st.length;
|
|
len = p - temp;
|
|
|
|
return (uuencode((u_char *)temp, len, (char *)buf, buflen));
|
|
}
|
|
|
|
int
|
|
radix_to_creds(const char *buf, CREDENTIALS *creds)
|
|
{
|
|
|
|
char *p;
|
|
int len, tl;
|
|
char version;
|
|
char temp[2048];
|
|
|
|
len = uudecode(buf, (u_char *)temp, sizeof(temp));
|
|
if (len < 0)
|
|
return 0;
|
|
|
|
p = temp;
|
|
|
|
/* check version and length! */
|
|
if (len < 1)
|
|
return 0;
|
|
version = *p;
|
|
p++;
|
|
len--;
|
|
|
|
GETSTRING(creds->service, p, len);
|
|
GETSTRING(creds->instance, p, len);
|
|
GETSTRING(creds->realm, p, len);
|
|
|
|
GETSTRING(creds->pname, p, len);
|
|
GETSTRING(creds->pinst, p, len);
|
|
/* Ignore possibly different realm. */
|
|
while (*p && len)
|
|
p++, len--;
|
|
if (len == 0)
|
|
return 0;
|
|
p++, len--;
|
|
|
|
/* Enough space for remaining fixed-length parts? */
|
|
if (len < (4 + 4 + sizeof(creds->session) + 2 + 4))
|
|
return 0;
|
|
|
|
GETLONG(creds->issue_date, p);
|
|
len -= 4;
|
|
{
|
|
u_int endTime;
|
|
GETLONG(endTime, p);
|
|
len -= 4;
|
|
creds->lifetime = krb_time_to_life(creds->issue_date, endTime);
|
|
}
|
|
|
|
memcpy(&creds->session, p, sizeof(creds->session));
|
|
p += sizeof(creds->session);
|
|
len -= sizeof(creds->session);
|
|
|
|
GETSHORT(creds->kvno, p);
|
|
len -= 2;
|
|
GETLONG(creds->ticket_st.length, p);
|
|
len -= 4;
|
|
|
|
tl = creds->ticket_st.length;
|
|
if (tl < 0 || tl > len || tl > sizeof(creds->ticket_st.dat))
|
|
return 0;
|
|
|
|
memcpy(creds->ticket_st.dat, p, tl);
|
|
p += tl;
|
|
len -= tl;
|
|
|
|
return 1;
|
|
}
|
|
#endif /* AFS */
|