Develop and Download Open Source Software

Browse Subversion Repository

Diff of /trunk/ttssh2/ttxssh/cipher.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 10647 by nmaya, Tue Mar 28 12:08:06 2023 UTC revision 10648 by nmaya, Tue Mar 28 14:12:32 2023 UTC
# Line 320  void normalize_cipher_order(char *buf) Line 320  void normalize_cipher_order(char *buf)
320             We *never* allow no encryption. */             We *never* allow no encryption. */
321          static char default_strings[] = {          static char default_strings[] = {
322                  SSH2_CIPHER_AES256_GCM,                  SSH2_CIPHER_AES256_GCM,
323    #if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER <= 0x3040300fL || LIBRESSL_VERSION_NUMBER >= 0x3070100fL
324                  SSH2_CIPHER_CAMELLIA256_CTR,                  SSH2_CIPHER_CAMELLIA256_CTR,
325    #endif
326                  SSH2_CIPHER_CHACHAPOLY,                  SSH2_CIPHER_CHACHAPOLY,
327                  SSH2_CIPHER_AES256_CTR,                  SSH2_CIPHER_AES256_CTR,
328                  SSH2_CIPHER_CAMELLIA256_CBC,                  SSH2_CIPHER_CAMELLIA256_CBC,
329                  SSH2_CIPHER_AES256_CBC,                  SSH2_CIPHER_AES256_CBC,
330    #if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER <= 0x3040300fL || LIBRESSL_VERSION_NUMBER >= 0x3070100fL
331                  SSH2_CIPHER_CAMELLIA192_CTR,                  SSH2_CIPHER_CAMELLIA192_CTR,
332    #endif
333                  SSH2_CIPHER_AES192_CTR,                  SSH2_CIPHER_AES192_CTR,
334                  SSH2_CIPHER_CAMELLIA192_CBC,                  SSH2_CIPHER_CAMELLIA192_CBC,
335                  SSH2_CIPHER_AES192_CBC,                  SSH2_CIPHER_AES192_CBC,
336                  SSH2_CIPHER_AES128_GCM,                  SSH2_CIPHER_AES128_GCM,
337    #if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER <= 0x3040300fL || LIBRESSL_VERSION_NUMBER >= 0x3070100fL
338                  SSH2_CIPHER_CAMELLIA128_CTR,                  SSH2_CIPHER_CAMELLIA128_CTR,
339    #endif
340                  SSH2_CIPHER_AES128_CTR,                  SSH2_CIPHER_AES128_CTR,
341                  SSH2_CIPHER_CAMELLIA128_CBC,                  SSH2_CIPHER_CAMELLIA128_CBC,
342                  SSH2_CIPHER_AES128_CBC,                  SSH2_CIPHER_AES128_CBC,
343  #if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x30000000UL  #if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER <= 0x3040300fL || LIBRESSL_VERSION_NUMBER >= 0x3070100fL
344                  SSH2_CIPHER_3DES_CTR,                  SSH2_CIPHER_3DES_CTR,
345  #endif  #endif
346                  SSH2_CIPHER_3DES_CBC,                  SSH2_CIPHER_3DES_CBC,
347  #if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x30000000UL  #if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER <= 0x3040300fL || LIBRESSL_VERSION_NUMBER >= 0x3070100fL
348                  SSH2_CIPHER_BLOWFISH_CTR,                  SSH2_CIPHER_BLOWFISH_CTR,
349  #endif  #endif
350                  SSH2_CIPHER_BLOWFISH_CBC,                  SSH2_CIPHER_BLOWFISH_CBC,
351  #if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x30000000UL  #if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER <= 0x3040300fL || LIBRESSL_VERSION_NUMBER >= 0x3070100fL
352                  SSH2_CIPHER_CAST128_CTR,                  SSH2_CIPHER_CAST128_CTR,
353  #endif  #endif
354                  SSH2_CIPHER_CAST128_CBC,                  SSH2_CIPHER_CAST128_CBC,
# Line 353  void normalize_cipher_order(char *buf) Line 359  void normalize_cipher_order(char *buf)
359                  SSH2_CIPHER_ARCFOUR,                  SSH2_CIPHER_ARCFOUR,
360                  SSH_CIPHER_BLOWFISH,                  SSH_CIPHER_BLOWFISH,
361                  SSH_CIPHER_DES,                  SSH_CIPHER_DES,
362  #if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x30000000UL  #if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER > 0x3040300fL && LIBRESSL_VERSION_NUMBER < 0x3070100fL
363                    0, 0, 0, // Dummy for SSH2_CIPHER_CAMELLIA256_CTR, SSH2_CIPHER_CAMELLIA192_CTR, SSH2_CIPHER_CAMELLIA128_CTR
364                  0, 0, 0, // Dummy for SSH2_CIPHER_3DES_CTR, SSH2_CIPHER_BLOWFISH_CTR, SSH2_CIPHER_CAST128_CTR                  0, 0, 0, // Dummy for SSH2_CIPHER_3DES_CTR, SSH2_CIPHER_BLOWFISH_CTR, SSH2_CIPHER_CAST128_CTR
365  #endif  #endif
366                  0, 0, 0 // Dummy for SSH_CIPHER_IDEA, SSH_CIPHER_TSS, SSH_CIPHER_RC4                  0, 0, 0 // Dummy for SSH_CIPHER_IDEA, SSH_CIPHER_TSS, SSH_CIPHER_RC4

Legend:
Removed from v.10647  
changed lines
  Added in v.10648

Back to OSDN">Back to OSDN
ViewVC Help
Powered by ViewVC 1.1.26