Skip to content
This repository was archived by the owner on Aug 24, 2025. It is now read-only.

Commit 0a8055f

Browse files
committed
project: Update for 1.1.0h merge.
1 parent 98c1d7e commit 0a8055f

File tree

6 files changed

+18
-15
lines changed

6 files changed

+18
-15
lines changed

SMP/buildinf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
#define CFLAGS "-DDSO_WIN32 -DNDEBUG -DOPENSSL_THREADS -DOPENSSL_NO_STATIC_ENGINE -DOPENSSL_PIC -DOPENSSL_IA32_SSE2 -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DMD5_ASM -DRMD160_ASM -DAES_ASM -DVPAES_ASM -DWHIRLPOOL_ASM -DGHASH_ASM -DECP_NISTZ256_ASM -DPOLY1305_ASM -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -DOPENSSL_BN_ASM_PART_WORDS"
66
#endif
77
#define PLATFORM "Windows"
8-
#define DATE "Sun 05 Nov 2017 19:33:24 DST"
8+
#define DATE "Tue 10 Apr 2018 07:20:16 PM STD"
99
#endif

SMP/crypto/rsaz-avx2.asm

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ $L$sqr_1024_no_n_copy:
9494
vmovdqu ymm8,YMMWORD[((256-128))+rsi]
9595

9696
lea rbx,[192+rsp]
97-
vpbroadcastq ymm15,QWORD[$L$and_mask]
97+
vmovdqu ymm15,YMMWORD[$L$and_mask]
9898
jmp NEAR $L$OOP_GRANDE_SQR_1024
9999

100100
ALIGN 32
@@ -863,10 +863,10 @@ $L$oop_mul_1024:
863863
vpmuludq ymm12,ymm11,YMMWORD[((192-128))+rcx]
864864
vpaddq ymm6,ymm6,ymm12
865865
vpmuludq ymm13,ymm11,YMMWORD[((224-128))+rcx]
866-
vpblendd ymm9,ymm9,ymm14,3
866+
vpblendd ymm12,ymm9,ymm14,3
867867
vpaddq ymm7,ymm7,ymm13
868868
vpmuludq ymm0,ymm11,YMMWORD[((256-128))+rcx]
869-
vpaddq ymm3,ymm3,ymm9
869+
vpaddq ymm3,ymm3,ymm12
870870
vpaddq ymm8,ymm8,ymm0
871871

872872
mov rax,rbx
@@ -879,7 +879,9 @@ $L$oop_mul_1024:
879879
vmovdqu ymm13,YMMWORD[((-8+64-128))+rsi]
880880

881881
mov rax,r10
882+
vpblendd ymm9,ymm9,ymm14,0xfc
882883
imul eax,r8d
884+
vpaddq ymm4,ymm4,ymm9
883885
and eax,0x1fffffff
884886

885887
imul rbx,QWORD[((16-128))+rsi]
@@ -1108,7 +1110,6 @@ $L$oop_mul_1024:
11081110

11091111
dec r14d
11101112
jnz NEAR $L$oop_mul_1024
1111-
vpermq ymm15,ymm15,0
11121113
vpaddq ymm0,ymm12,YMMWORD[rsp]
11131114

11141115
vpsrlq ymm12,ymm0,29
@@ -1785,7 +1786,7 @@ rsaz_avx2_eligible:
17851786

17861787
ALIGN 64
17871788
$L$and_mask:
1788-
DQ 0x1fffffff,0x1fffffff,0x1fffffff,-1
1789+
DQ 0x1fffffff,0x1fffffff,0x1fffffff,0x1fffffff
17891790
$L$scatter_permd:
17901791
DD 0,2,4,6,7,7,7,7
17911792
$L$gather_permd:

SMP/libcrypto.def

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2164,6 +2164,7 @@ EXPORTS
21642164
OCSP_resp_get0_id
21652165
OCSP_resp_get0_produced_at
21662166
OCSP_resp_get0_signature
2167+
OCSP_resp_get0_signer
21672168
OCSP_response_create
21682169
OCSP_response_get1_basic
21692170
OCSP_response_status
@@ -3484,6 +3485,7 @@ EXPORTS
34843485
X509_find_by_issuer_and_serial
34853486
X509_find_by_subject
34863487
X509_free
3488+
X509_get0_authority_key_id
34873489
X509_get0_extensions
34883490
X509_get0_notAfter
34893491
X509_get0_notBefore

SMP/libcrypto.rc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
LANGUAGE 0x09,0x01
44

55
1 VERSIONINFO
6-
FILEVERSION 1,1,0,7
7-
PRODUCTVERSION 1,1,0,7
6+
FILEVERSION 1,1,0,8
7+
PRODUCTVERSION 1,1,0,8
88
FILEFLAGSMASK 0x3fL
99
#ifdef _DEBUG
1010
FILEFLAGS 0x01L
@@ -22,11 +22,11 @@ BEGIN
2222
// Required:
2323
VALUE "CompanyName", "The OpenSSL Project, http://www.openssl.org/\0"
2424
VALUE "FileDescription", "OpenSSL shared library\0"
25-
VALUE "FileVersion", "1.1.0g\0"
25+
VALUE "FileVersion", "1.1.0h\0"
2626
VALUE "InternalName", "libcrypto\0"
2727
VALUE "OriginalFilename", "libcrypto.dll\0"
2828
VALUE "ProductName", "The OpenSSL Toolkit\0"
29-
VALUE "ProductVersion", "1.1.0g\0"
29+
VALUE "ProductVersion", "1.1.0h\0"
3030
// Optional:
3131
//VALUE "Comments", "\0"
3232
VALUE "LegalCopyright", "Copyright 1998-2016 The OpenSSL Authors. All rights reserved.\0"

SMP/libssl.rc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
LANGUAGE 0x09,0x01
44

55
1 VERSIONINFO
6-
FILEVERSION 1,1,0,7
7-
PRODUCTVERSION 1,1,0,7
6+
FILEVERSION 1,1,0,8
7+
PRODUCTVERSION 1,1,0,8
88
FILEFLAGSMASK 0x3fL
99
#ifdef _DEBUG
1010
FILEFLAGS 0x01L
@@ -22,11 +22,11 @@ BEGIN
2222
// Required:
2323
VALUE "CompanyName", "The OpenSSL Project, http://www.openssl.org/\0"
2424
VALUE "FileDescription", "OpenSSL shared library\0"
25-
VALUE "FileVersion", "1.1.0g\0"
25+
VALUE "FileVersion", "1.1.0h\0"
2626
VALUE "InternalName", "libssl\0"
2727
VALUE "OriginalFilename", "libssl.dll\0"
2828
VALUE "ProductName", "The OpenSSL Toolkit\0"
29-
VALUE "ProductVersion", "1.1.0g\0"
29+
VALUE "ProductVersion", "1.1.0h\0"
3030
// Optional:
3131
//VALUE "Comments", "\0"
3232
VALUE "LegalCopyright", "Copyright 1998-2016 The OpenSSL Authors. All rights reserved.\0"

SMP/openssl/opensslconf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* WARNING: do not edit!
33
* Generated by makefile from ./include/openssl/opensslconf.h.in
44
*
5-
* Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
5+
* Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
66
*
77
* Licensed under the OpenSSL license (the "License"). You may not use
88
* this file except in compliance with the License. You can obtain a copy

0 commit comments

Comments
 (0)