View | Details | Raw Unified | Return to bug 675 | Differences between
and this patch

Collapse All | Expand All

(-)cipher-3des1.c (+4 lines)
Lines 29-34 Link Here
29 
#include "xmalloc.h"
 29 
#include "xmalloc.h"
30 
#include "log.h"
 30 
#include "log.h"
31 

          31
          

        

            

              
              
              32
              
#if OPENSSL_VERSION_NUMBER < 0x00906000L

            

            

              33
              
#define SSH_OLD_EVP

            

            

              34
              
#endif

            

            

              35
              

            

        

          32
          
/*

          36
          
/*

        

        

          33
          
 * This is used by SSH1:

          37
          
 * This is used by SSH1:

        

        

          34
          
 *

          38
          
 *

        



(-)cipher-aes.c
      (+4 lines)




  

    
      
            Lines 31-36
          
      
      
        Link Here
      
    
  

        

          31
          
#include "xmalloc.h"

          31
          
#include "xmalloc.h"

        

        

          32
          
#include "log.h"

          32
          
#include "log.h"

        

        

          33
          

          33
          

        

            

              
              
              34
              
#if OPENSSL_VERSION_NUMBER < 0x00906000L

            

            

              35
              
#define SSH_OLD_EVP

            

            

              36
              
#endif

            

            

              37
              

            

        

          34
          
#define RIJNDAEL_BLOCKSIZE 16

          38
          
#define RIJNDAEL_BLOCKSIZE 16

        

        

          35
          
struct ssh_rijndael_ctx

          39
          
struct ssh_rijndael_ctx

        

        

          36
          
{

          40
          
{

        



(-)cipher-bf1.c
      (+5 lines)




  

    
      
            Lines 28-33
          
      
      
        Link Here
      
    
  

        

          28
          
#include <openssl/evp.h>

          28
          
#include <openssl/evp.h>

        

        

          29
          
#include "xmalloc.h"

          29
          
#include "xmalloc.h"

        

        

          30
          
#include "log.h"

          30
          
#include "log.h"

        

            

              
              
              31
              

            

            

              32
              
#if OPENSSL_VERSION_NUMBER < 0x00906000L

            

            

              33
              
#define SSH_OLD_EVP

            

            

              34
              
#endif

            

            

              35
              

            

        

          31
          
/*

          36
          
/*

        

        

          32
          
 * SSH1 uses a variation on Blowfish, all bytes must be swapped before

          37
          
 * SSH1 uses a variation on Blowfish, all bytes must be swapped before

        

        

          33
          
 * and after encryption/decryption. Thus the swap_bytes stuff (yuk).

          38
          
 * and after encryption/decryption. Thus the swap_bytes stuff (yuk).

        



(-)cipher-ctr.c
      (+6 lines)




  

    
      
            Lines 21-26
          
      
      
        Link Here
      
    
  

        

          21
          
#include "log.h"

          21
          
#include "log.h"

        

        

          22
          
#include "xmalloc.h"

          22
          
#include "xmalloc.h"

        

        

          23
          

          23
          

        

            

              
              
              24
              
#if OPENSSL_VERSION_NUMBER < 0x00906000L

            

            

              25
              
#define SSH_OLD_EVP

            

            

              26
              
#endif

            

            

              27
              

            

        

          24
          
#if OPENSSL_VERSION_NUMBER < 0x00907000L

          28
          
#if OPENSSL_VERSION_NUMBER < 0x00907000L

        

        

          25
          
#include "rijndael.h"

          29
          
#include "rijndael.h"

        

        

          26
          
#define AES_KEY rijndael_ctx

          30
          
#define AES_KEY rijndael_ctx

        

  

    
      
            Lines 135-141
          
      
      
        Link Here
      
    
  

        

          135
          
	aes_ctr.init = ssh_aes_ctr_init;

          139
          
	aes_ctr.init = ssh_aes_ctr_init;

        

        

          136
          
	aes_ctr.cleanup = ssh_aes_ctr_cleanup;

          140
          
	aes_ctr.cleanup = ssh_aes_ctr_cleanup;

        

        

          137
          
	aes_ctr.do_cipher = ssh_aes_ctr;

          141
          
	aes_ctr.do_cipher = ssh_aes_ctr;

        

            

              
              
              142
              
#ifndef SSH_OLD_EVP

            

        

          138
          
	aes_ctr.flags = EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH |

          143
          
	aes_ctr.flags = EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH |

        

        

          139
          
	    EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CUSTOM_IV;

          144
          
	    EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CUSTOM_IV;

        

            

              
              
              145
              
#endif

            

        

          140
          
	return (&aes_ctr);

          146
          
	return (&aes_ctr);

        

        

          141
          
}

          147
          
}

        






  

  Return to bug 675