Add RFC5297 AES-SIV support

[openssl.git] / crypto / armv4cpuid.pl

diff --git a/crypto/armv4cpuid.pl b/crypto/armv4cpuid.pl
index 33c893d0e460f7e901240f68456712fbb968ecbd..3a7be6e54136b1a9f458941c8f3fb95ee1b70120 100644 (file)
--- a/crypto/armv4cpuid.pl
+++ b/crypto/armv4cpuid.pl
@@ -1,7 +1,7 @@
 #! /usr/bin/env perl
-# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved.
 #
-# Licensed under the OpenSSL license (the "License").  You may not use
+# Licensed under the Apache License 2.0 (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
@@ -27,6 +27,7 @@ $code.=<<___;
 .thumb
 #else
 .code  32
+#undef __thumb2__
 #endif
 
 .align 5
@@ -124,7 +125,7 @@ CRYPTO_memcmp:
 
        ldmia   sp!,{r4,r5}
 .Lno_data:
-       neg     r0,ip
+       rsb     r0,ip,#0
        mov     r0,r0,lsr#31
 #if __ARM_ARCH__>=5
        bx      lr