Add setter and getter for X509_STORE's check_policy

[openssl.git] / crypto / x86_64cpuid.pl

diff --git a/crypto/x86_64cpuid.pl b/crypto/x86_64cpuid.pl
index 450550bfb5f610e19518b21cd831e2af0181712b..6cb152148b5b6eae2d61da23e18dd442e3edfff5 100644 (file)
--- a/crypto/x86_64cpuid.pl
+++ b/crypto/x86_64cpuid.pl
@@ -18,7 +18,7 @@ $0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1;
 ( $xlate="${dir}perlasm/x86_64-xlate.pl" and -f $xlate) or
 die "can't locate x86_64-xlate.pl";
 
 ( $xlate="${dir}perlasm/x86_64-xlate.pl" and -f $xlate) or
 die "can't locate x86_64-xlate.pl";
 

-open OUT,"| \"$^X\" $xlate $flavour $output";
+open OUT,"| \"$^X\" \"$xlate\" $flavour \"$output\"";

 *STDOUT=*OUT;
 
 ($arg1,$arg2,$arg3,$arg4)=$win64?("%rcx","%rdx","%r8", "%r9") :        # Win64 order
 *STDOUT=*OUT;
 
 ($arg1,$arg2,$arg3,$arg4)=$win64?("%rcx","%rdx","%r8", "%r9") :        # Win64 order


@@ -224,6 +224,28 @@ OPENSSL_cleanse:
        jne     .Little
        ret
 .size  OPENSSL_cleanse,.-OPENSSL_cleanse
        jne     .Little
        ret
 .size  OPENSSL_cleanse,.-OPENSSL_cleanse

+
+.globl  CRYPTO_memcmp
+.type   CRYPTO_memcmp,\@abi-omnipotent
+.align  16
+CRYPTO_memcmp:
+       xor     %rax,%rax
+       xor     %r10,%r10
+       cmp     \$0,$arg3
+       je      .Lno_data
+.Loop_cmp:
+       mov     ($arg1),%r10b
+       lea     1($arg1),$arg1
+       xor     ($arg2),%r10b
+       lea     1($arg2),$arg2
+       or      %r10b,%al
+       dec     $arg3
+       jnz     .Loop_cmp
+       neg     %rax
+       shr     \$63,%rax
+.Lno_data:
+       ret
+.size  CRYPTO_memcmp,.-CRYPTO_memcmp

 ___
 
 print<<___ if (!$win64);
 ___
 
 print<<___ if (!$win64);


@@ -371,36 +393,67 @@ OPENSSL_instrument_bus2:
 ___
 }
 
 ___
 }
 

+sub gen_random {
+my $rdop = shift;

 print<<___;
 print<<___;

-.globl OPENSSL_ia32_rdrand
-.type  OPENSSL_ia32_rdrand,\@abi-omnipotent
+.globl OPENSSL_ia32_${rdop}
+.type  OPENSSL_ia32_${rdop},\@abi-omnipotent

 .align 16
 .align 16

-OPENSSL_ia32_rdrand:
+OPENSSL_ia32_${rdop}:

        mov     \$8,%ecx
        mov     \$8,%ecx

-.Loop_rdrand:
-       rdrand  %rax
-       jc      .Lbreak_rdrand
-       loop    .Loop_rdrand
-.Lbreak_rdrand:
+.Loop_${rdop}:
+       ${rdop} %rax
+       jc      .Lbreak_${rdop}
+       loop    .Loop_${rdop}
+.Lbreak_${rdop}:

        cmp     \$0,%rax
        cmove   %rcx,%rax
        ret
        cmp     \$0,%rax
        cmove   %rcx,%rax
        ret

-.size  OPENSSL_ia32_rdrand,.-OPENSSL_ia32_rdrand
+.size  OPENSSL_ia32_${rdop},.-OPENSSL_ia32_${rdop}

 
 

-.globl OPENSSL_ia32_rdseed
-.type  OPENSSL_ia32_rdseed,\@abi-omnipotent
+.globl OPENSSL_ia32_${rdop}_bytes
+.type  OPENSSL_ia32_${rdop}_bytes,\@abi-omnipotent

 .align 16
 .align 16

-OPENSSL_ia32_rdseed:
-       mov     \$8,%ecx
-.Loop_rdseed:
-       rdseed  %rax
-       jc      .Lbreak_rdseed
-       loop    .Loop_rdseed
-.Lbreak_rdseed:
-       cmp     \$0,%rax
-       cmove   %rcx,%rax
+OPENSSL_ia32_${rdop}_bytes:
+       xor     %rax, %rax      # return value
+       cmp     \$0,$arg2
+       je      .Ldone_${rdop}_bytes
+
+       mov     \$8,%r11
+.Loop_${rdop}_bytes:
+       ${rdop} %r10
+       jc      .Lbreak_${rdop}_bytes
+       dec     %r11
+       jnz     .Loop_${rdop}_bytes
+       jmp     .Ldone_${rdop}_bytes
+
+.align 16
+.Lbreak_${rdop}_bytes:
+       cmp     \$8,$arg2
+       jb      .Ltail_${rdop}_bytes
+       mov     %r10,($arg1)
+       lea     8($arg1),$arg1
+       add     \$8,%rax
+       sub     \$8,$arg2
+       jz      .Ldone_${rdop}_bytes
+       mov     \$8,%r11
+       jmp     .Loop_${rdop}_bytes
+
+.align 16
+.Ltail_${rdop}_bytes:
+       mov     %r10b,($arg1)
+       lea     1($arg1),$arg1
+       inc     %rax
+       shr     \$8,%r8
+       dec     $arg2
+       jnz     .Ltail_${rdop}_bytes
+
+.Ldone_${rdop}_bytes:

        ret
        ret

-.size  OPENSSL_ia32_rdseed,.-OPENSSL_ia32_rdseed
+.size  OPENSSL_ia32_${rdop}_bytes,.-OPENSSL_ia32_${rdop}_bytes

 ___
 ___

+}
+gen_random("rdrand");
+gen_random("rdseed");

 
 close STDOUT;  # flush
 
 close STDOUT;  # flush