upd: openssl to 1.1.0

[cassiopeia.git] / lib / openssl / crypto / camellia / asm / cmll-x86.pl

diff --git a/lib/openssl/crypto/camellia/asm/cmll-x86.pl b/lib/openssl/crypto/camellia/asm/cmll-x86.pl
index c314d62312f00c32f1e710858647a7f8d2910554..59f9ed9141b0ebc9b82c70444b03f02d2924afec 100644 (file)
--- a/lib/openssl/crypto/camellia/asm/cmll-x86.pl
+++ b/lib/openssl/crypto/camellia/asm/cmll-x86.pl
@@ -1,4 +1,11 @@
-#!/usr/bin/env perl
+#! /usr/bin/env perl
+# Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved.
+#
+# Licensed under the OpenSSL license (the "License").  You may not use
+# this file except in compliance with the License.  You can obtain a copy
+# in the file LICENSE in the source distribution or at
+# https://www.openssl.org/source/license.html
+
 
 # ====================================================================
 # Copyright (c) 2008 Andy Polyakov <appro@openssl.org>
@@ -42,6 +49,9 @@ require "x86asm.pl";
 
 $OPENSSL=1;
 
+$output = pop;
+open STDOUT,">$output";
+
 &asm_init($ARGV[0],"cmll-586.pl",$ARGV[$#ARGV] eq "386");
 
 @T=("eax","ebx","ecx","edx");
@@ -723,11 +733,11 @@ my $bias=int(@T[0])?shift(@T):0;
 &function_end("Camellia_Ekeygen");
 
 if ($OPENSSL) {
-# int private_Camellia_set_key (
+# int Camellia_set_key (
 #              const unsigned char *userKey,
 #              int bits,
 #              CAMELLIA_KEY *key)
-&function_begin_B("private_Camellia_set_key");
+&function_begin_B("Camellia_set_key");
        &push   ("ebx");
        &mov    ("ecx",&wparam(0));     # pull arguments
        &mov    ("ebx",&wparam(1));
@@ -760,7 +770,7 @@ if ($OPENSSL) {
 &set_label("done",4);
        &pop    ("ebx");
        &ret    ();
-&function_end_B("private_Camellia_set_key");
+&function_end_B("Camellia_set_key");
 }
 
 @SBOX=(
@@ -1136,3 +1146,5 @@ my ($s0,$s1,$s2,$s3) = @T;
 &asciz("Camellia for x86 by <appro\@openssl.org>");
 
 &asm_finish();
+
+close STDOUT;