project: Update for 1.1.0f merge.

Author: Sibras

SMP/crypto/aesni-sha1-x86_64.asm

@@ -2795,6 +2795,7 @@ $L$prologue_shaext:
 	mov	r11d,DWORD[240+rcx]
 	sub	rsi,rdi
 	movups	xmm15,XMMWORD[rcx]
+	movups	xmm2,XMMWORD[r8]
 	movups	xmm0,XMMWORD[16+rcx]
 	lea	rcx,[112+rcx]
 

SMP/crypto/aesni-sha256-x86_64.asm

@@ -4147,6 +4147,7 @@ $L$prologue_shaext:
 	mov	r11d,DWORD[240+rcx]
 	sub	rsi,rdi
 	movups	xmm15,XMMWORD[rcx]
+	movups	xmm6,XMMWORD[r8]
 	movups	xmm4,XMMWORD[16+rcx]
 	lea	rcx,[112+rcx]
 

SMP/crypto/include/internal/dso_conf.h

@@ -12,5 +12,5 @@
 #ifndef HEADER_DSO_CONF_H
 # define HEADER_DSO_CONF_H
 
-# define DSO_EXTENSION ""
+# define DSO_EXTENSION ".dll"
 #endif

SMP/crypto/x86_64cpuid.asm

@@ -119,14 +119,6 @@ $L$intel:
 	shr	r10d,14
 	and	r10d,0xfff
 
-	cmp	r11d,7
-	jb	NEAR $L$nocacheinfo
-
-	mov	eax,7
-	xor	ecx,ecx
-	cpuid
-	mov	DWORD[8+rdi],ebx
-
 $L$nocacheinfo:
 	mov	eax,1
 	cpuid
@@ -156,6 +148,15 @@ $L$generic:
 	or	r9d,ecx
 
 	mov	r10d,edx
+
+	cmp	r11d,7
+	jb	NEAR $L$no_extended_info
+	mov	eax,7
+	xor	ecx,ecx
+	cpuid
+	mov	DWORD[8+rdi],ebx
+$L$no_extended_info:
+
 	bt	r9d,27
 	jnc	NEAR $L$clear_avx
 	xor	ecx,ecx

SMP/crypto/x86cpuid.asm

@@ -27,10 +27,10 @@ L$_OPENSSL_ia32_cpuid_begin:
 	pop	eax
 	xor	ecx,eax
 	xor	eax,eax
-	bt	ecx,21
-	jnc	NEAR L$000nocpuid
 	mov	esi,DWORD [20+esp]
 	mov	DWORD [8+esi],eax
+	bt	ecx,21
+	jnc	NEAR L$000nocpuid
 	cpuid
 	mov	edi,eax
 	xor	eax,eax
@@ -81,40 +81,32 @@ L$_OPENSSL_ia32_cpuid_begin:
 	and	edx,4026531839
 	jmp	NEAR L$002generic
 L$001intel:
-	cmp	edi,7
-	jb	NEAR L$003cacheinfo
-	mov	esi,DWORD [20+esp]
-	mov	eax,7
-	xor	ecx,ecx
-	cpuid
-	mov	DWORD [8+esi],ebx
-L$003cacheinfo:
 	cmp	edi,4
-	mov	edi,-1
-	jb	NEAR L$004nocacheinfo
+	mov	esi,-1
+	jb	NEAR L$003nocacheinfo
 	mov	eax,4
 	mov	ecx,0
 	cpuid
-	mov	edi,eax
-	shr	edi,14
-	and	edi,4095
-L$004nocacheinfo:
+	mov	esi,eax
+	shr	esi,14
+	and	esi,4095
+L$003nocacheinfo:
 	mov	eax,1
 	xor	ecx,ecx
 	cpuid
 	and	edx,3220176895
 	cmp	ebp,0
-	jne	NEAR L$005notintel
+	jne	NEAR L$004notintel
 	or	edx,1073741824
 	and	ah,15
 	cmp	ah,15
-	jne	NEAR L$005notintel
+	jne	NEAR L$004notintel
 	or	edx,1048576
-L$005notintel:
+L$004notintel:
 	bt	edx,28
 	jnc	NEAR L$002generic
 	and	edx,4026531839
-	cmp	edi,0
+	cmp	esi,0
 	je	NEAR L$002generic
 	or	edx,268435456
 	shr	ebx,16
@@ -126,7 +118,15 @@ L$002generic:
 	and	ecx,4294965247
 	mov	esi,edx
 	or	ebp,ecx
-	bt	ecx,27
+	cmp	edi,7
+	mov	edi,DWORD [20+esp]
+	jb	NEAR L$005no_extended_info
+	mov	eax,7
+	xor	ecx,ecx
+	cpuid
+	mov	DWORD [8+edi],ebx
+L$005no_extended_info:
+	bt	ebp,27
 	jnc	NEAR L$006clear_avx
 	xor	ecx,ecx
 db	15,1,208
@@ -140,7 +140,6 @@ L$008clear_xmm:
 	and	esi,4278190079
 L$006clear_avx:
 	and	ebp,4026525695
-	mov	edi,DWORD [20+esp]
 	and	DWORD [8+edi],4294967263
 L$007done:
 	mov	eax,esi

SMP/libcrypto.def

@@ -4042,4 +4042,12 @@ EXPORTS
     X509_VERIFY_PARAM_get_inh_flags
     X509_VERIFY_PARAM_get_time
     X509_VERIFY_PARAM_set_inh_flags
+    INT32_it
+    INT64_it
+    UINT32_it
+    UINT64_it
+    ZINT32_it
+    ZINT64_it
+    ZUINT32_it
+    ZUINT64_it
 

SMP/libcrypto.rc

@@ -3,8 +3,8 @@
 LANGUAGE 0x09,0x01
 
 1 VERSIONINFO
-  FILEVERSION 1,1,0,5
-  PRODUCTVERSION 1,1,0,5
+  FILEVERSION 1,1,0,6
+  PRODUCTVERSION 1,1,0,6
   FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
   FILEFLAGS 0x01L
@@ -22,11 +22,11 @@ BEGIN
             // Required:
             VALUE "CompanyName", "The OpenSSL Project, http://www.openssl.org/\0"
             VALUE "FileDescription", "OpenSSL shared library\0"
-            VALUE "FileVersion", "1.1.0e\0"
+            VALUE "FileVersion", "1.1.0f\0"
             VALUE "InternalName", "libcrypto\0"
             VALUE "OriginalFilename", "libcrypto.dll\0"
             VALUE "ProductName", "The OpenSSL Toolkit\0"
-            VALUE "ProductVersion", "1.1.0e\0"
+            VALUE "ProductVersion", "1.1.0f\0"
             // Optional:
             //VALUE "Comments", "\0"
             VALUE "LegalCopyright", "Copyright 1998-2016 The OpenSSL Authors. All rights reserved.\0"

SMP/libcrypto.vcxproj

@@ -106,6 +106,7 @@
     <ClCompile Include="..\crypto\asn1\x_algor.c" />
     <ClCompile Include="..\crypto\asn1\x_bignum.c" />
     <ClCompile Include="..\crypto\asn1\x_info.c" />
+    <ClCompile Include="..\crypto\asn1\x_int64.c" />
     <ClCompile Include="..\crypto\asn1\x_long.c" />
     <ClCompile Include="..\crypto\asn1\x_pkey.c" />
     <ClCompile Include="..\crypto\asn1\x_sig.c" />
@@ -732,6 +733,7 @@
     <ClInclude Include="..\crypto\x509v3\ext_dat.h" />
     <ClInclude Include="..\crypto\x509v3\pcy_int.h" />
     <ClInclude Include="..\crypto\x509\x509_lcl.h" />
+    <ClInclude Include="..\include\internal\asn1t.h" />
     <ClInclude Include="..\include\internal\bio.h" />
     <ClInclude Include="..\include\internal\comp.h" />
     <ClInclude Include="..\include\internal\conf.h" />

SMP/libcrypto.vcxproj.filters

@@ -2103,6 +2103,9 @@
     <ClCompile Include="..\crypto\dllmain.c">
       <Filter>Source Files\crypto</Filter>
     </ClCompile>
+    <ClCompile Include="..\crypto\asn1\x_int64.c">
+      <Filter>Source Files\crypto\asn1</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\include\openssl\ocsp.h">
@@ -2567,6 +2570,9 @@
     <ClInclude Include="..\include\internal\conf.h">
       <Filter>Header Files\include\internal</Filter>
     </ClInclude>
+    <ClInclude Include="..\include\internal\asn1t.h">
+      <Filter>Header Files\include\internal</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <YASM Include="crypto\aes-586.asm">

SMP/libssl.rc

@@ -3,8 +3,8 @@
 LANGUAGE 0x09,0x01
 
 1 VERSIONINFO
-  FILEVERSION 1,1,0,5
-  PRODUCTVERSION 1,1,0,5
+  FILEVERSION 1,1,0,6
+  PRODUCTVERSION 1,1,0,6
   FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
   FILEFLAGS 0x01L
@@ -22,11 +22,11 @@ BEGIN
             // Required:
             VALUE "CompanyName", "The OpenSSL Project, http://www.openssl.org/\0"
             VALUE "FileDescription", "OpenSSL shared library\0"
-            VALUE "FileVersion", "1.1.0e\0"
+            VALUE "FileVersion", "1.1.0f\0"
             VALUE "InternalName", "libssl\0"
             VALUE "OriginalFilename", "libssl.dll\0"
             VALUE "ProductName", "The OpenSSL Toolkit\0"
-            VALUE "ProductVersion", "1.1.0e\0"
+            VALUE "ProductVersion", "1.1.0f\0"
             // Optional:
             //VALUE "Comments", "\0"
             VALUE "LegalCopyright", "Copyright 1998-2016 The OpenSSL Authors. All rights reserved.\0"