[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  2ca1e22b2acdacb0a879dded91bdd5b2b6040ad3 (commit)
      from  a97d19d9e534fe69d6eb6c6413d1217d39032604 (commit)


- Log -----------------------------------------------------------------
commit 2ca1e22b2acdacb0a879dded91bdd5b2b6040ad3
Author: Jérôme Duval <jerome.duval at gmail.com>
Date:   Sun Apr 17 16:36:30 2016 +0200

    Haiku x86-64 doesn't need RC4_CHAR.
    
    * add a comment about Haiku being built with no-asm.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

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

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 4a8fb00..de591c9 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1764,10 +1764,11 @@ sub vms_info {
                                        release => "-fomit-frame-pointer")),
         bn_ops           => "BN_LLONG",
     },
+    # Haiku builds with no-asm
     "haiku-x86_64" => {
         inherit_from     => [ "haiku-common", asm("x86_64_asm") ],
         cflags           => add("-m64"),
-        bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
+        bn_ops           => "SIXTY_FOUR_BIT_LONG",
     },