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

Diff for /src/usr.bin/ssh/ssh-keysign.c between version 1.18.6.1 and 1.18.6.2

version 1.18.6.1, 2006/02/03 03:01:57 version 1.18.6.2, 2006/10/06 03:19:33
Line 1 
Line 1 
   /* $OpenBSD$ */
 /*  /*
  * Copyright (c) 2002 Markus Friedl.  All rights reserved.   * Copyright (c) 2002 Markus Friedl.  All rights reserved.
  *   *
Line 21 
Line 22 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF   * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * 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"  
 RCSID("$OpenBSD$");  
   
   #include <sys/types.h>
   
 #include <openssl/evp.h>  #include <openssl/evp.h>
 #include <openssl/rand.h>  #include <openssl/rand.h>
 #include <openssl/rsa.h>  #include <openssl/rsa.h>
   
   #include <fcntl.h>
   #include <paths.h>
   #include <pwd.h>
   #include <stdlib.h>
   #include <string.h>
   #include <unistd.h>
   
   #include "xmalloc.h"
 #include "log.h"  #include "log.h"
 #include "key.h"  #include "key.h"
 #include "ssh.h"  #include "ssh.h"
 #include "ssh2.h"  #include "ssh2.h"
 #include "misc.h"  #include "misc.h"
 #include "xmalloc.h"  
 #include "buffer.h"  #include "buffer.h"
 #include "bufaux.h"  
 #include "authfile.h"  #include "authfile.h"
 #include "msg.h"  #include "msg.h"
 #include "canohost.h"  #include "canohost.h"
Line 62 
Line 69 
         buffer_init(&b);          buffer_init(&b);
         buffer_append(&b, data, datalen);          buffer_append(&b, data, datalen);
   
         /* session id, currently limited to SHA1 (20 bytes) */          /* session id, currently limited to SHA1 (20 bytes) or SHA256 (32) */
         p = buffer_get_string(&b, &len);          p = buffer_get_string(&b, &len);
         if (len != 20)          if (len != 20 && len != 32)
                 fail++;                  fail++;
         xfree(p);          xfree(p);
   

Legend:
Removed from v.1.18.6.1  
changed lines
  Added in v.1.18.6.2