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

Commit cff5550

Browse files
SibrasSibras
committed
project: Update for 1.1.0i merge.
1 parent eae3a30 commit cff5550

File tree

11 files changed

+120
-71
lines changed

11 files changed

+120
-71
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 "Tue 10 Apr 2018 07:20:16 PM STD"
8+
#define DATE "Sun Sep 2 19:50:24 2018"
99
#endif

‎SMP/crypto/ecp_nistz256-x86.asm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3831,7 +3831,7 @@ L$_ecp_nistz256_scatter_w7_begin:
38313831
mov edi,DWORD [20+esp]
38323832
mov esi,DWORD [24+esp]
38333833
mov ebp,DWORD [28+esp]
3834-
lea edi,[ebp*1+edi-1]
3834+
lea edi,[ebp*1+edi]
38353835
mov ebp,16
38363836
L$007scatter_w7_loop:
38373837
mov eax,DWORD [esi]

‎SMP/crypto/x86-mont.asm‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -450,16 +450,18 @@ L$016sub:
450450
lea edx,[1+edx]
451451
jge NEAR L$016sub
452452
sbb eax,0
453-
and esi,eax
454-
not eax
455-
mov ebp,edi
456-
and ebp,eax
457-
or esi,ebp
453+
mov edx,-1
454+
xor edx,eax
455+
jmp NEAR L$017copy
458456
align 16
459457
L$017copy:
460-
mov eax,DWORD [ebx*4+esi]
461-
mov DWORD [ebx*4+edi],eax
458+
mov esi,DWORD [32+ebx*4+esp]
459+
mov ebp,DWORD [ebx*4+edi]
462460
mov DWORD [32+ebx*4+esp],ecx
461+
and esi,eax
462+
and ebp,edx
463+
or ebp,esi
464+
mov DWORD [ebx*4+edi],ebp
463465
dec ebx
464466
jge NEAR L$017copy
465467
mov esp,DWORD [24+esp]

‎SMP/crypto/x86_64-mont.asm‎

Lines changed: 39 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -214,30 +214,30 @@ $L$inner_enter:
214214

215215
xor r14,r14
216216
mov rax,QWORD[rsp]
217-
lea rsi,[rsp]
218217
mov r15,r9
219-
jmp NEAR $L$sub
218+
220219
ALIGN 16
221220
$L$sub: sbb rax,QWORD[r14*8+rcx]
222221
mov QWORD[r14*8+rdi],rax
223-
mov rax,QWORD[8+r14*8+rsi]
222+
mov rax,QWORD[8+r14*8+rsp]
224223
lea r14,[1+r14]
225224
dec r15
226225
jnz NEAR $L$sub
227226

228227
sbb rax,0
228+
mov rbx,-1
229+
xor rbx,rax
229230
xor r14,r14
230-
and rsi,rax
231-
not rax
232-
mov rcx,rdi
233-
and rcx,rax
234231
mov r15,r9
235-
or rsi,rcx
236-
ALIGN 16
232+
237233
$L$copy:
238-
mov rax,QWORD[r14*8+rsi]
239-
mov QWORD[r14*8+rsp],r14
240-
mov QWORD[r14*8+rdi],rax
234+
mov rcx,QWORD[r14*8+rdi]
235+
mov rdx,QWORD[r14*8+rsp]
236+
and rcx,rbx
237+
and rdx,rax
238+
mov QWORD[r14*8+rsp],r9
239+
or rdx,rcx
240+
mov QWORD[r14*8+rdi],rdx
241241
lea r14,[1+r14]
242242
sub r15,1
243243
jnz NEAR $L$copy
@@ -605,20 +605,18 @@ $L$inner4x:
605605
cmp r14,r9
606606
jb NEAR $L$outer4x
607607
mov rdi,QWORD[16+r9*8+rsp]
608+
lea r15,[((-4))+r9]
608609
mov rax,QWORD[rsp]
609-
pxor xmm0,xmm0
610610
mov rdx,QWORD[8+rsp]
611-
shr r9,2
611+
shr r15,2
612612
lea rsi,[rsp]
613613
xor r14,r14
614614

615615
sub rax,QWORD[rcx]
616616
mov rbx,QWORD[16+rsi]
617617
mov rbp,QWORD[24+rsi]
618618
sbb rdx,QWORD[8+rcx]
619-
lea r15,[((-1))+r9]
620-
jmp NEAR $L$sub4x
621-
ALIGN 16
619+
622620
$L$sub4x:
623621
mov QWORD[r14*8+rdi],rax
624622
mov QWORD[8+r14*8+rdi],rdx
@@ -645,34 +643,35 @@ $L$sub4x:
645643

646644
sbb rax,0
647645
mov QWORD[24+r14*8+rdi],rbp
648-
xor r14,r14
649-
and rsi,rax
650-
not rax
651-
mov rcx,rdi
652-
and rcx,rax
653-
lea r15,[((-1))+r9]
654-
or rsi,rcx
655-
656-
movdqu xmm1,XMMWORD[rsi]
657-
movdqa XMMWORD[rsp],xmm0
658-
movdqu XMMWORD[rdi],xmm1
646+
pxor xmm0,xmm0
647+
DB 102,72,15,110,224
648+
pcmpeqd xmm5,xmm5
649+
pshufd xmm4,xmm4,0
650+
mov r15,r9
651+
pxor xmm5,xmm4
652+
shr r15,2
653+
xor eax,eax
654+
659655
jmp NEAR $L$copy4x
660656
ALIGN 16
661657
$L$copy4x:
662-
movdqu xmm2,XMMWORD[16+r14*1+rsi]
663-
movdqu xmm1,XMMWORD[32+r14*1+rsi]
664-
movdqa XMMWORD[16+r14*1+rsp],xmm0
665-
movdqu XMMWORD[16+r14*1+rdi],xmm2
666-
movdqa XMMWORD[32+r14*1+rsp],xmm0
667-
movdqu XMMWORD[32+r14*1+rdi],xmm1
668-
lea r14,[32+r14]
658+
movdqa xmm1,XMMWORD[rax*1+rsp]
659+
movdqu xmm2,XMMWORD[rax*1+rdi]
660+
pand xmm1,xmm4
661+
pand xmm2,xmm5
662+
movdqa xmm3,XMMWORD[16+rax*1+rsp]
663+
movdqa XMMWORD[rax*1+rsp],xmm0
664+
por xmm1,xmm2
665+
movdqu xmm2,XMMWORD[16+rax*1+rdi]
666+
movdqu XMMWORD[rax*1+rdi],xmm1
667+
pand xmm3,xmm4
668+
pand xmm2,xmm5
669+
movdqa XMMWORD[16+rax*1+rsp],xmm0
670+
por xmm3,xmm2
671+
movdqu XMMWORD[16+rax*1+rdi],xmm3
672+
lea rax,[32+rax]
669673
dec r15
670674
jnz NEAR $L$copy4x
671-
672-
shl r9,2
673-
movdqu xmm2,XMMWORD[16+r14*1+rsi]
674-
movdqa XMMWORD[16+r14*1+rsp],xmm0
675-
movdqu XMMWORD[16+r14*1+rdi],xmm2
676675
mov rsi,QWORD[8+r9*8+rsp]
677676
mov rax,1
678677
mov r15,QWORD[((-48))+rsi]

‎SMP/crypto/x86_64-mont5.asm‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -410,18 +410,19 @@ $L$sub: sbb rax,QWORD[r14*8+rcx]
410410
jnz NEAR $L$sub
411411

412412
sbb rax,0
413+
mov rbx,-1
414+
xor rbx,rax
413415
xor r14,r14
414-
and rsi,rax
415-
not rax
416-
mov rcx,rdi
417-
and rcx,rax
418416
mov r15,r9
419-
or rsi,rcx
420-
ALIGN 16
417+
421418
$L$copy:
422-
mov rax,QWORD[r14*8+rsi]
419+
mov rcx,QWORD[r14*8+rdi]
420+
mov rdx,QWORD[r14*8+rsp]
421+
and rcx,rbx
422+
and rdx,rax
423423
mov QWORD[r14*8+rsp],r14
424-
mov QWORD[r14*8+rdi],rax
424+
or rdx,rcx
425+
mov QWORD[r14*8+rdi],rdx
425426
lea r14,[1+r14]
426427
sub r15,1
427428
jnz NEAR $L$copy

‎SMP/libcrypto.def‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3171,9 +3171,32 @@ EXPORTS
31713171
X509_LOOKUP_ctrl
31723172
X509_LOOKUP_file
31733173
X509_LOOKUP_free
3174+
X509_LOOKUP_get_method_data
3175+
X509_LOOKUP_get_store
31743176
X509_LOOKUP_hash_dir
31753177
X509_LOOKUP_init
3178+
X509_LOOKUP_meth_free
3179+
X509_LOOKUP_meth_get_ctrl
3180+
X509_LOOKUP_meth_get_free
3181+
X509_LOOKUP_meth_get_get_by_alias
3182+
X509_LOOKUP_meth_get_get_by_fingerprint
3183+
X509_LOOKUP_meth_get_get_by_issuer_serial
3184+
X509_LOOKUP_meth_get_get_by_subject
3185+
X509_LOOKUP_meth_get_init
3186+
X509_LOOKUP_meth_get_new_item
3187+
X509_LOOKUP_meth_get_shutdown
3188+
X509_LOOKUP_meth_new
3189+
X509_LOOKUP_meth_set_ctrl
3190+
X509_LOOKUP_meth_set_free
3191+
X509_LOOKUP_meth_set_get_by_alias
3192+
X509_LOOKUP_meth_set_get_by_fingerprint
3193+
X509_LOOKUP_meth_set_get_by_issuer_serial
3194+
X509_LOOKUP_meth_set_get_by_subject
3195+
X509_LOOKUP_meth_set_init
3196+
X509_LOOKUP_meth_set_new_item
3197+
X509_LOOKUP_meth_set_shutdown
31763198
X509_LOOKUP_new
3199+
X509_LOOKUP_set_method_data
31773200
X509_LOOKUP_shutdown
31783201
X509_NAME_ENTRY_create_by_NID
31793202
X509_NAME_ENTRY_create_by_OBJ
@@ -3220,6 +3243,8 @@ EXPORTS
32203243
X509_OBJECT_new
32213244
X509_OBJECT_retrieve_by_subject
32223245
X509_OBJECT_retrieve_match
3246+
X509_OBJECT_set1_X509
3247+
X509_OBJECT_set1_X509_CRL
32233248
X509_OBJECT_up_ref_count
32243249
X509_PKEY_free
32253250
X509_PKEY_new
@@ -3433,6 +3458,7 @@ EXPORTS
34333458
X509_VERIFY_PARAM_get_count
34343459
X509_VERIFY_PARAM_get_depth
34353460
X509_VERIFY_PARAM_get_flags
3461+
X509_VERIFY_PARAM_get_hostflags
34363462
X509_VERIFY_PARAM_get_inh_flags
34373463
X509_VERIFY_PARAM_get_time
34383464
X509_VERIFY_PARAM_inherit
@@ -3642,6 +3668,9 @@ EXPORTS
36423668
b2i_PrivateKey_bio
36433669
b2i_PublicKey
36443670
b2i_PublicKey_bio
3671+
conf_ssl_get
3672+
conf_ssl_get_cmd
3673+
conf_ssl_name_find
36453674
d2i_ACCESS_DESCRIPTION
36463675
d2i_ASIdOrRange
36473676
d2i_ASIdentifierChoice

‎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,8
7-
PRODUCTVERSION 1,1,0,8
6+
FILEVERSION 1,1,0,9
7+
PRODUCTVERSION 1,1,0,9
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.0h\0"
25+
VALUE "FileVersion", "1.1.0i\0"
2626
VALUE "InternalName", "libcrypto\0"
2727
VALUE "OriginalFilename", "libcrypto.dll\0"
2828
VALUE "ProductName", "The OpenSSL Toolkit\0"
29-
VALUE "ProductVersion", "1.1.0h\0"
29+
VALUE "ProductVersion", "1.1.0i\0"
3030
// Optional:
3131
//VALUE "Comments", "\0"
3232
VALUE "LegalCopyright", "Copyright 1998-2016 The OpenSSL Authors. All rights reserved.\0"

‎SMP/libcrypto.vcxproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@
233233
<ClCompile Include="..\crypto\conf\conf_mall.c" />
234234
<ClCompile Include="..\crypto\conf\conf_mod.c" />
235235
<ClCompile Include="..\crypto\conf\conf_sap.c" />
236+
<ClCompile Include="..\crypto\conf\conf_ssl.c" />
236237
<ClCompile Include="..\crypto\cpt_err.c" />
237238
<ClCompile Include="..\crypto\cryptlib.c" />
238239
<ClCompile Include="..\crypto\ct\ct_b64.c" />
@@ -643,6 +644,7 @@
643644
<ClCompile Include="..\crypto\x509\x509_err.c" />
644645
<ClCompile Include="..\crypto\x509\x509_ext.c" />
645646
<ClCompile Include="..\crypto\x509\x509_lu.c" />
647+
<ClCompile Include="..\crypto\x509\x509_meth.c" />
646648
<ClCompile Include="..\crypto\x509\x509_obj.c" />
647649
<ClCompile Include="..\crypto\x509\x509_r2x.c" />
648650
<ClCompile Include="..\crypto\x509\x509_req.c" />
@@ -683,6 +685,7 @@
683685
<ClInclude Include="..\crypto\cms\cms_lcl.h" />
684686
<ClInclude Include="..\crypto\comp\comp_lcl.h" />
685687
<ClInclude Include="..\crypto\conf\conf_def.h" />
688+
<ClInclude Include="..\crypto\conf\conf_lcl.h" />
686689
<ClInclude Include="..\crypto\ct\ct_locl.h" />
687690
<ClInclude Include="..\crypto\des\des_locl.h" />
688691
<ClInclude Include="..\crypto\des\rpc_des.h" />

‎SMP/libcrypto.vcxproj.filters‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2106,6 +2106,12 @@
21062106
<ClCompile Include="..\crypto\asn1\x_int64.c">
21072107
<Filter>Source Files\crypto\asn1</Filter>
21082108
</ClCompile>
2109+
<ClCompile Include="..\crypto\conf\conf_ssl.c">
2110+
<Filter>Source Files\crypto\conf</Filter>
2111+
</ClCompile>
2112+
<ClCompile Include="..\crypto\x509\x509_meth.c">
2113+
<Filter>Source Files\crypto\x509</Filter>
2114+
</ClCompile>
21092115
</ItemGroup>
21102116
<ItemGroup>
21112117
<ClInclude Include="..\include\openssl\ocsp.h">
@@ -2573,6 +2579,9 @@
25732579
<ClInclude Include="..\include\internal\asn1t.h">
25742580
<Filter>Header Files\include\internal</Filter>
25752581
</ClInclude>
2582+
<ClInclude Include="..\crypto\conf\conf_lcl.h">
2583+
<Filter>Header Files\crypto\conf</Filter>
2584+
</ClInclude>
25762585
</ItemGroup>
25772586
<ItemGroup>
25782587
<YASM Include="crypto\aes-586.asm">

‎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,8
7-
PRODUCTVERSION 1,1,0,8
6+
FILEVERSION 1,1,0,9
7+
PRODUCTVERSION 1,1,0,9
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.0h\0"
25+
VALUE "FileVersion", "1.1.0i\0"
2626
VALUE "InternalName", "libssl\0"
2727
VALUE "OriginalFilename", "libssl.dll\0"
2828
VALUE "ProductName", "The OpenSSL Toolkit\0"
29-
VALUE "ProductVersion", "1.1.0h\0"
29+
VALUE "ProductVersion", "1.1.0i\0"
3030
// Optional:
3131
//VALUE "Comments", "\0"
3232
VALUE "LegalCopyright", "Copyright 1998-2016 The OpenSSL Authors. All rights reserved.\0"

0 commit comments

Comments
 (0)