NOTE: This update changes the RSA key generation. *NEW RSA KEYS

[openssh.git] / radix.c

diff --git a/radix.c b/radix.c
index 7e668ea656682fabd73f56ad7accece5d95a1ab9..3b149a82ba8241d6fa505daaa19c343e3fd9bd6f 100644 (file)
--- a/radix.c
+++ b/radix.c
@@ -1,25 +1,43 @@
 /*
- *   radix.c
+ * Copyright (c) 1999 Dug Song.  All rights reserved.
  *
- *   Dug Song <dugsong@UMICH.EDU>
+ * 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.12 2000/06/22 23:55:00 djm Exp $");
+RCSID("$OpenBSD: radix.c,v 1.15 2001/01/16 23:58:09 deraadt Exp $");
 
 #ifdef AFS
 #include <krb.h>
 
-typedef unsigned char my_u_char;
-typedef unsigned int my_u_int32_t;
-typedef unsigned short my_u_short;
+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); \
+       register my_u_char *t_cp = (my_u_char *)(cp); \
        (s) = (((my_u_short)t_cp[0]) << 8) \
            | (((my_u_short)t_cp[1])) \
            ; \
@@ -27,7 +45,7 @@ typedef unsigned 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) \
@@ -38,7 +56,7 @@ typedef unsigned 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; \
@@ -46,7 +64,7 @@ typedef unsigned 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; \
@@ -55,9 +73,9 @@ typedef unsigned 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++;                        \
     }                                          \
@@ -71,7 +89,7 @@ typedef unsigned short my_u_short;
 
 
 int
-creds_to_radix(CREDENTIALS *creds, unsigned char *buf, size_t buflen)
+creds_to_radix(CREDENTIALS *creds, u_char *buf, size_t buflen)
 {
        char *p, *s;
        int len;
@@ -105,8 +123,8 @@ creds_to_radix(CREDENTIALS *creds, unsigned char *buf, size_t buflen)
 
        PUTLONG(creds->issue_date, p);
        {
-               unsigned int endTime;
-               endTime = (unsigned int) krb_life_to_time(creds->issue_date,
+               u_int endTime;
+               endTime = (u_int) krb_life_to_time(creds->issue_date,
                                                          creds->lifetime);
                PUTLONG(endTime, p);
        }
@@ -121,7 +139,7 @@ creds_to_radix(CREDENTIALS *creds, unsigned char *buf, size_t buflen)
        p += creds->ticket_st.length;
        len = p - temp;
 
-       return (uuencode((unsigned char *)temp, len, (char *)buf, buflen));
+       return (uuencode((u_char *)temp, len, (char *)buf, buflen));
 }
 
 int
@@ -133,7 +151,7 @@ radix_to_creds(const char *buf, CREDENTIALS *creds)
        char version;
        char temp[2048];
 
-       len = uudecode(buf, (unsigned char *)temp, sizeof(temp));
+       len = uudecode(buf, (u_char *)temp, sizeof(temp));
        if (len < 0)
                return 0;
 
@@ -166,7 +184,7 @@ radix_to_creds(const char *buf, CREDENTIALS *creds)
        GETLONG(creds->issue_date, p);
        len -= 4;
        {
-               unsigned int endTime;
+               u_int endTime;
                GETLONG(endTime, p);
                len -= 4;
                creds->lifetime = krb_time_to_life(creds->issue_date, endTime);