[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  2b58c83e6271cd9ca4cde02d58cb428c351908f9 (commit)
      from  dc57696ceec4643da1cbb69f9d1491a96e5126c4 (commit)


- Log -----------------------------------------------------------------
commit 2b58c83e6271cd9ca4cde02d58cb428c351908f9
Author: Benjamin Kaduk <bkaduk at akamai.com>
Date:   Wed Aug 3 15:07:55 2016 -0500

    Remove some unused options from 10-main.conf
    
    The options RC4_CHUNK_LL, DES_PTR, and BF_PTR were removed by Rich
    in commit 3e9e810f2e047effb1056211794d2d12ec2b04e7 but were still
    sticking around in a coupule configuration entries.
    
    Since they're unused, remove them.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1390)

-----------------------------------------------------------------------

Summary of changes:
 Configurations/10-main.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index ec7a7d9..cc1a207 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1755,7 +1755,7 @@ sub vms_info {
         #as               => "???",
         #debug_aflags     => "/NOOPTIMIZE/DEBUG",
         #release_aflags   => "/OPTIMIZE/NODEBUG",
-        bn_opts          => "SIXTY_FOUR_BIT RC4_INT RC4_CHUNK_LL DES_PTR BF_PTR",
+        bn_opts          => "SIXTY_FOUR_BIT RC4_INT",
     },
     "vms-alpha-p32" => {
         inherit_from     => [ "vms-generic" ],
@@ -1807,7 +1807,7 @@ sub vms_info {
         #as               => "I4S",
         #debug_aflags     => "/NOOPTIMIZE/DEBUG",
         #release_aflags   => "/OPTIMIZE/NODEBUG",
-        bn_opts          => "SIXTY_FOUR_BIT RC4_INT RC4_CHUNK_LL DES_PTR BF_PTR",
+        bn_opts          => "SIXTY_FOUR_BIT RC4_INT",
     },
     "vms-ia64-p32" => {
         inherit_from     => [ "vms-generic" ],