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

Diff for /src/usr.bin/ssh/gss-serv.c between version 1.14 and 1.14.2.1

version 1.14, 2006/02/08 13:15:44 version 1.14.2.1, 2006/09/30 04:06:50
Line 1 
Line 1 
 /*      $OpenBSD$       */  /* $OpenBSD$ */
   
 /*  /*
  * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.   * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
Line 24 
Line 24 
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */   */
   
 #include "includes.h"  #include <sys/types.h>
   
 #ifdef GSSAPI  #ifdef GSSAPI
   
 #include "bufaux.h"  #include <string.h>
   
   #include "xmalloc.h"
   #include "buffer.h"
   #include "key.h"
   #include "hostfile.h"
 #include "auth.h"  #include "auth.h"
 #include "log.h"  #include "log.h"
 #include "channels.h"  #include "channels.h"
 #include "session.h"  #include "session.h"
 #include "servconf.h"  #include "misc.h"
 #include "xmalloc.h"  
 #include "getput.h"  
   
 #include "ssh-gss.h"  #include "ssh-gss.h"
   
Line 78 
Line 81 
                             &supported_mechs[i]->oid, oidset);                              &supported_mechs[i]->oid, oidset);
                 i++;                  i++;
         }          }
   
           gss_release_oid_set(&min_status, &supported);
 }  }
   
   
Line 151 
Line 156 
          * second without.           * second without.
          */           */
   
         oidl = GET_16BIT(tok+2); /* length including next two bytes */          oidl = get_u16(tok+2); /* length including next two bytes */
         oidl = oidl-2; /* turn it into the _real_ length of the variable OID */          oidl = oidl-2; /* turn it into the _real_ length of the variable OID */
   
         /*          /*
Line 168 
Line 173 
         if (ename->length < offset+4)          if (ename->length < offset+4)
                 return GSS_S_FAILURE;                  return GSS_S_FAILURE;
   
         name->length = GET_32BIT(tok+offset);          name->length = get_u32(tok+offset);
         offset += 4;          offset += 4;
   
         if (ename->length < offset+name->length)          if (ename->length < offset+name->length)
Legend:
Removed from v.1.14  
changed lines
  Added in v.1.14.2.1