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

Diff for /src/usr.bin/ssh/cipher.h between version 1.44 and 1.45

version 1.44, 2014/01/25 10:12:50 version 1.45, 2014/04/29 18:01:49
Line 39 
Line 39 
   
 #include <openssl/evp.h>  #include <openssl/evp.h>
 #include "cipher-chachapoly.h"  #include "cipher-chachapoly.h"
   #include "cipher-aesctr.h"
   
 /*  /*
  * Cipher types for SSH-1.  New types can be added, but old types should not   * Cipher types for SSH-1.  New types can be added, but old types should not
Line 69 
Line 70 
         int     encrypt;          int     encrypt;
         EVP_CIPHER_CTX evp;          EVP_CIPHER_CTX evp;
         struct chachapoly_ctx cp_ctx; /* XXX union with evp? */          struct chachapoly_ctx cp_ctx; /* XXX union with evp? */
           struct aesctr_ctx ac_ctx; /* XXX union with evp? */
         const Cipher *cipher;          const Cipher *cipher;
 };  };
   
Legend:
Removed from v.1.44  
changed lines
  Added in v.1.45