[BACK]Return to radix.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/Attic/radix.c between version 1.11.2.4 and 1.12

version 1.11.2.4, 2001/03/21 18:52:56 version 1.12, 2000/06/22 23:55:00
Line 1 
Line 1 
 /*  /*
  * Copyright (c) 1999 Dug Song.  All rights reserved.   *   radix.c
  *   *
  * Redistribution and use in source and binary forms, with or without   *   Dug Song <dugsong@UMICH.EDU>
  * 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 "includes.h"
Line 30 
Line 12 
 #ifdef AFS  #ifdef AFS
 #include <krb.h>  #include <krb.h>
   
 typedef u_char my_u_char;  typedef unsigned char my_u_char;
 typedef u_int my_u_int32_t;  typedef unsigned int my_u_int32_t;
 typedef u_short my_u_short;  typedef unsigned short my_u_short;
   
 /* Nasty macros from BIND-4.9.2 */  /* Nasty macros from BIND-4.9.2 */
   
 #define GETSHORT(s, cp) { \  #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) \          (s) = (((my_u_short)t_cp[0]) << 8) \
             | (((my_u_short)t_cp[1])) \              | (((my_u_short)t_cp[1])) \
             ; \              ; \
Line 45 
Line 27 
 }  }
   
 #define GETLONG(l, cp) { \  #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) \          (l) = (((my_u_int32_t)t_cp[0]) << 24) \
             | (((my_u_int32_t)t_cp[1]) << 16) \              | (((my_u_int32_t)t_cp[1]) << 16) \
             | (((my_u_int32_t)t_cp[2]) << 8) \              | (((my_u_int32_t)t_cp[2]) << 8) \
Line 56 
Line 38 
   
 #define PUTSHORT(s, cp) { \  #define PUTSHORT(s, cp) { \
         register my_u_short t_s = (my_u_short)(s); \          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 >> 8; \
         *t_cp   = t_s; \          *t_cp   = t_s; \
         (cp) += 2; \          (cp) += 2; \
Line 64 
Line 46 
   
 #define PUTLONG(l, cp) { \  #define PUTLONG(l, cp) { \
         register my_u_int32_t t_l = (my_u_int32_t)(l); \          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 >> 24; \
         *t_cp++ = t_l >> 16; \          *t_cp++ = t_l >> 16; \
         *t_cp++ = t_l >> 8; \          *t_cp++ = t_l >> 8; \
Line 73 
Line 55 
 }  }
   
 #define GETSTRING(s, p, p_l) {                  \  #define GETSTRING(s, p, p_l) {                  \
     register char *p_targ = (p) + p_l;          \      register char* p_targ = (p) + p_l;          \
     register char *s_c = (s);                   \      register char* s_c = (s);                   \
     register char *p_c = (p);                   \      register char* p_c = (p);                   \
     while (*p_c && (p_c < p_targ)) {            \      while (*p_c && (p_c < p_targ)) {            \
         *s_c++ = *p_c++;                        \          *s_c++ = *p_c++;                        \
     }                                           \      }                                           \
Line 89 
Line 71 
   
   
 int  int
 creds_to_radix(CREDENTIALS *creds, u_char *buf, size_t buflen)  creds_to_radix(CREDENTIALS *creds, unsigned char *buf, size_t buflen)
 {  {
         char *p, *s;          char *p, *s;
         int len;          int len;
Line 123 
Line 105 
   
         PUTLONG(creds->issue_date, p);          PUTLONG(creds->issue_date, p);
         {          {
                 u_int endTime;                  unsigned int endTime;
                 endTime = (u_int) krb_life_to_time(creds->issue_date,                  endTime = (unsigned int) krb_life_to_time(creds->issue_date,
                                                           creds->lifetime);                                                            creds->lifetime);
                 PUTLONG(endTime, p);                  PUTLONG(endTime, p);
         }          }
Line 139 
Line 121 
         p += creds->ticket_st.length;          p += creds->ticket_st.length;
         len = p - temp;          len = p - temp;
   
         return (uuencode((u_char *)temp, len, (char *)buf, buflen));          return (uuencode((unsigned char *)temp, len, (char *)buf, buflen));
 }  }
   
 int  int
Line 151 
Line 133 
         char version;          char version;
         char temp[2048];          char temp[2048];
   
         len = uudecode(buf, (u_char *)temp, sizeof(temp));          len = uudecode(buf, (unsigned char *)temp, sizeof(temp));
         if (len < 0)          if (len < 0)
                 return 0;                  return 0;
   
Line 184 
Line 166 
         GETLONG(creds->issue_date, p);          GETLONG(creds->issue_date, p);
         len -= 4;          len -= 4;
         {          {
                 u_int endTime;                  unsigned int endTime;
                 GETLONG(endTime, p);                  GETLONG(endTime, p);
                 len -= 4;                  len -= 4;
                 creds->lifetime = krb_time_to_life(creds->issue_date, endTime);                  creds->lifetime = krb_time_to_life(creds->issue_date, endTime);
Legend:
Removed from v.1.11.2.4  
changed lines
  Added in v.1.12