]> andersk Git - openssh.git/blobdiff - radix.c
- (stevesk) [acconfig.h auth-passwd.c configure.ac sshd.c] HP-UX 10.26
[openssh.git] / radix.c
diff --git a/radix.c b/radix.c
index ea7f5ba2bcac16714d88a5085b8e2c12e8b36228..019d7a3f99628956b4ede1ae4178ed5b1e10ffd7 100644 (file)
--- a/radix.c
+++ b/radix.c
 /*
- *   radix.c
- * 
- *   base-64 encoding pinched from lynx2-7-2, who pinched it from rpem.
- *   Originally written by Mark Riordan 12 August 1990 and 17 Feb 1991
- *   and placed in the public domain.
- * 
- *   Dug Song <dugsong@UMICH.EDU>
+ * Copyright (c) 1999 Dug Song.  All rights reserved.
+ * Copyright (c) 2002 Markus Friedl.  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.20 2002/04/23 12:58:26 markus Exp $");
 
 #ifdef AFS
 #include <krb.h>
 
-char six2pr[64] = {
-       'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
-       'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
-       'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
-       'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
-       '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/'
-};
-
-unsigned char pr2six[256];
-
-int 
-uuencode(unsigned char *bufin, unsigned int nbytes, char *bufcoded)
-{
-       /* ENC is the basic 1 character encoding function to make a char printing */
-#define ENC(c) six2pr[c]
-
-       register char *outptr = bufcoded;
-       unsigned int i;
+#include <radix.h>
+#include "bufaux.h"
 
-       for (i = 0; i < nbytes; i += 3) {
-               *(outptr++) = ENC(*bufin >> 2);                                         /* c1 */
-               *(outptr++) = ENC(((*bufin << 4) & 060)   | ((bufin[1] >> 4) & 017));   /* c2 */
-               *(outptr++) = ENC(((bufin[1] << 2) & 074) | ((bufin[2] >> 6) & 03));    /* c3 */
-               *(outptr++) = ENC(bufin[2] & 077);                                      /* c4 */
-               bufin += 3;
-       }
-       if (i == nbytes + 1) {
-               outptr[-1] = '=';
-       } else if (i == nbytes + 2) {
-               outptr[-1] = '=';
-               outptr[-2] = '=';
-       }
-       *outptr = '\0';
-       return (outptr - bufcoded);
-}
-
-int 
-uudecode(const char *bufcoded, unsigned char *bufplain, int outbufsize)
+int
+creds_to_radix(CREDENTIALS *creds, u_char *buf, size_t buflen)
 {
-       /* single character decode */
-#define DEC(c) pr2six[(unsigned char)c]
-#define MAXVAL 63
-
-       static int first = 1;
-       int nbytesdecoded, j;
-       const char *bufin = bufcoded;
-       register unsigned char *bufout = bufplain;
-       register int nprbytes;
-
-       /* If this is the first call, initialize the mapping table. */
-       if (first) {
-               first = 0;
-               for (j = 0; j < 256; j++)
-                       pr2six[j] = MAXVAL + 1;
-               for (j = 0; j < 64; j++)
-                       pr2six[(unsigned char) six2pr[j]] = (unsigned char) j;
-       }
-       /* Strip leading whitespace. */
-       while (*bufcoded == ' ' || *bufcoded == '\t')
-               bufcoded++;
-
-       /*
-        * Figure out how many characters are in the input buffer. If this
-        * would decode into more bytes than would fit into the output
-        * buffer, adjust the number of input bytes downwards.
-        */
-       bufin = bufcoded;
-       while (DEC(*(bufin++)) <= MAXVAL);
-       nprbytes = bufin - bufcoded - 1;
-       nbytesdecoded = ((nprbytes + 3) / 4) * 3;
-       if (nbytesdecoded > outbufsize)
-               nprbytes = (outbufsize * 4) / 3;
-
-       bufin = bufcoded;
-
-       while (nprbytes > 0) {
-               *(bufout++) = (unsigned char) (DEC(*bufin)   << 2 | DEC(bufin[1]) >> 4);
-               *(bufout++) = (unsigned char) (DEC(bufin[1]) << 4 | DEC(bufin[2]) >> 2);
-               *(bufout++) = (unsigned char) (DEC(bufin[2]) << 6 | DEC(bufin[3]));
-               bufin += 4;
-               nprbytes -= 4;
-       }
-       if (nprbytes & 03) {
-               if (DEC(bufin[-2]) > MAXVAL)
-                       nbytesdecoded -= 2;
-               else
-                       nbytesdecoded -= 1;
-       }
-       return (nbytesdecoded);
-}
-
-typedef unsigned char my_u_char;
-typedef unsigned int my_u_int32_t;
-typedef unsigned 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; \
-}
+       Buffer b;
+       int ret;
 
-#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;                                 \
-}
+       buffer_init(&b);
 
+       buffer_put_char(&b, 1); /* version */
 
-int 
-creds_to_radix(CREDENTIALS *creds, unsigned char *buf)
-{
-       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;
+       buffer_append(&b, creds->service, strlen(creds->service));
+       buffer_put_char(&b, '\0');
+       buffer_append(&b, creds->instance, strlen(creds->instance));
+       buffer_put_char(&b, '\0');
+       buffer_append(&b, creds->realm, strlen(creds->realm));
+       buffer_put_char(&b, '\0');
+       buffer_append(&b, creds->pname, strlen(creds->pname));
+       buffer_put_char(&b, '\0');
+       buffer_append(&b, creds->pinst, strlen(creds->pinst));
+       buffer_put_char(&b, '\0');
 
-       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);
-       {
-               unsigned int endTime;
-               endTime = (unsigned int) krb_life_to_time(creds->issue_date,
-                                                         creds->lifetime);
-               PUTLONG(endTime, p);
-       }
+       buffer_put_char(&b, '\0');
 
-       memcpy(p, &creds->session, sizeof(creds->session));
-       p += sizeof(creds->session);
+       buffer_put_int(&b, creds->issue_date);
+       buffer_put_int(&b, krb_life_to_time(creds->issue_date,
+           creds->lifetime));
+       buffer_append(&b, creds->session, sizeof(creds->session));
+       buffer_put_short(&b, creds->kvno);
 
-       PUTSHORT(creds->kvno, p);
-       PUTLONG(creds->ticket_st.length, p);
+       /* 32 bit size + data */
+       buffer_put_string(&b, creds->ticket_st.dat, creds->ticket_st.length);
 
-       memcpy(p, creds->ticket_st.dat, creds->ticket_st.length);
-       p += creds->ticket_st.length;
-       len = p - temp;
+       ret = uuencode(buffer_ptr(&b), buffer_len(&b), (char *)buf, buflen);
 
-       return (uuencode((unsigned char *)temp, len, (char *)buf));
+       buffer_free(&b);
+       return ret;
 }
 
-int 
+#define GETSTRING(b, t, tlen) \
+       do { \
+               int i, found = 0; \
+               for (i = 0; i < tlen; i++) { \
+                       if (buffer_len(b) == 0) \
+                               goto done; \
+                       t[i] = buffer_get_char(b); \
+                       if (t[i] == '\0') { \
+                               found = 1; \
+                               break; \
+                       } \
+               } \
+               if (!found) \
+                       goto done; \
+       } while(0)
+
+int
 radix_to_creds(const char *buf, CREDENTIALS *creds)
 {
+       Buffer b;
+       char c, version, *space, *p;
+       u_int endTime;
+       int len, blen, ret;
 
-       char *p;
-       int len, tl;
-       char version;
-       char temp[2048];
+       ret = 0;
+       blen = strlen(buf);
 
-       if (!(len = uudecode(buf, (unsigned char *)temp, sizeof(temp))))
+       /* sanity check for size */
+       if (blen > 8192)
                return 0;
 
-       p = temp;
+       buffer_init(&b);
+       space = buffer_append_space(&b, blen);
 
        /* check version and length! */
+       len = uudecode(buf, space, blen);
        if (len < 1)
-               return 0;
-       version = *p;
-       p++;
-       len--;
+               goto done;
 
-       GETSTRING(creds->service, p, len);
-       GETSTRING(creds->instance, p, len);
-       GETSTRING(creds->realm, p, len);
+       version = buffer_get_char(&b);
 
-       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;
-       {
-               unsigned 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);
+       GETSTRING(&b, creds->service, sizeof creds->service);
+       GETSTRING(&b, creds->instance, sizeof creds->instance);
+       GETSTRING(&b, creds->realm, sizeof creds->realm);
+       GETSTRING(&b, creds->pname, sizeof creds->pname);
+       GETSTRING(&b, creds->pinst, sizeof creds->pinst);
 
-       GETSHORT(creds->kvno, p);
-       len -= 2;
-       GETLONG(creds->ticket_st.length, p);
-       len -= 4;
+       if (buffer_len(&b) == 0)
+               goto done;
 
-       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;
+       /* Ignore possibly different realm. */
+       while (buffer_len(&b) > 0 && (c = buffer_get_char(&b)) != '\0')
+               ;
+
+       if (buffer_len(&b) == 0)
+               goto done;
+
+       creds->issue_date = buffer_get_int(&b);
+
+       endTime = buffer_get_int(&b);
+       creds->lifetime = krb_time_to_life(creds->issue_date, endTime);
+
+       len = buffer_len(&b);
+       if (len < sizeof(creds->session))
+               goto done;
+       memcpy(&creds->session, buffer_ptr(&b), sizeof(creds->session));
+       buffer_consume(&b, sizeof(creds->session));
+
+       creds->kvno = buffer_get_short(&b);
+
+       p = buffer_get_string(&b, &len);
+       if (len < 0 || len > sizeof(creds->ticket_st.dat))
+               goto done;
+       memcpy(&creds->ticket_st.dat, p, len);
+       creds->ticket_st.length = len;
+       
+       ret = 1;
+done:
+       buffer_free(&b);
+       return ret;
 }
 #endif /* AFS */
This page took 0.052276 seconds and 4 git commands to generate.