[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openssl-cvs
Subject:    [CVS] OpenSSL: OpenSSL_0_9_8-stable: openssl/doc/apps/ ciphers.pod ope...
From:       "Bodo Moeller" <bodo () openssl ! org>
Date:       2007-04-25 7:58:36
Message-ID: 20070425075836.69F471AC6149 () master ! openssl ! org
[Download RAW message or body]

  OpenSSL CVS Repository
  http://cvs.openssl.org/
  ____________________________________________________________________________

  Server: cvs.openssl.org                  Name:   Bodo Moeller
  Root:   /v/openssl/cvs                   Email:  bodo@openssl.org
  Module: openssl                          Date:   25-Apr-2007 09:58:35
  Branch: OpenSSL_0_9_8-stable             Handle: 2007042508583002

  Modified files:           (Branch: OpenSSL_0_9_8-stable)
    openssl/doc/apps        ciphers.pod
    openssl/ssl             ssl.h

  Log:
    Ensure that AES remains the preferred cipher at any given key length.
    (This does not really require a special case for Camellia.)

  Summary:
    Revision    Changes     Path
    1.9.2.5     +1  -2      openssl/doc/apps/ciphers.pod
    1.161.2.11  +1  -5      openssl/ssl/ssl.h
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openssl/doc/apps/ciphers.pod
  ============================================================================
  $ cvs diff -u -r1.9.2.4 -r1.9.2.5 ciphers.pod
  --- openssl/doc/apps/ciphers.pod	23 Apr 2007 23:50:17 -0000	1.9.2.4
  +++ openssl/doc/apps/ciphers.pod	25 Apr 2007 07:58:30 -0000	1.9.2.5
  @@ -105,8 +105,7 @@
   =item B<DEFAULT>
   
   the default cipher list. This is determined at compile time and is normally
  -B<ALL:!aNULL:!eNULL:+RC4:@STRENGTH> or
  -B<AES:CAMELLIA:ALL!aNULL:!eNULL:+RC4:@STRENGTH>. This must be the first cipher \
string  +B<AES:ALL:!aNULL:!eNULL:+RC4:@STRENGTH>. This must be the first cipher \
string  specified.
   
   =item B<COMPLEMENTOFDEFAULT>
  @@ .
  patch -p0 <<'@@ .'
  Index: openssl/ssl/ssl.h
  ============================================================================
  $ cvs diff -u -r1.161.2.10 -r1.161.2.11 ssl.h
  --- openssl/ssl/ssl.h	23 Apr 2007 23:50:21 -0000	1.161.2.10
  +++ openssl/ssl/ssl.h	25 Apr 2007 07:58:32 -0000	1.161.2.11
  @@ -317,11 +317,7 @@
   /* The following cipher list is used by default.
    * It also is substituted when an application-defined cipher list string
    * starts with 'DEFAULT'. */
  -#ifdef OPENSSL_NO_CAMELLIA
  -# define SSL_DEFAULT_CIPHER_LIST	"ALL:!aNULL:!eNULL:+RC4:@STRENGTH" /* low \
                priority for RC4 */
  -#else
  -# define SSL_DEFAULT_CIPHER_LIST	"AES:CAMELLIA:ALL:!aNULL:!eNULL:+RC4:@STRENGTH" \
                /* low priority for RC4 */
  -#endif
  +#define SSL_DEFAULT_CIPHER_LIST	"AES:ALL:!aNULL:!eNULL:+RC4:@STRENGTH" /* low \
priority for RC4 */  
   /* Used in SSL_set_shutdown()/SSL_get_shutdown(); */
   #define SSL_SENT_SHUTDOWN	1
  @@ .
______________________________________________________________________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                     openssl-cvs@openssl.org
Automated List Manager                           majordomo@openssl.org


[prev in list] [next in list] [prev in thread] [next in thread]