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

Commit 8e93e67

Browse files
SibrasSibras
committed
projects: Update for 1.1.0g merge.
1 parent d7435a9 commit 8e93e67

File tree

8 files changed

+66
-45
lines changed

8 files changed

+66
-45
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 "19 Feb 2017 19:56:25"
8+
#define DATE "Sun 05 Nov 2017 19:33:24 DST"
99
#endif

‎SMP/crypto/ecp_nistz256-x86_64.asm‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3507,19 +3507,18 @@ DB 0x67
35073507
adox r13,rbp
35083508
DB 0x67,0x67
35093509
mulx rax,rcx,rdx
3510-
mov rdx,r8
3510+
mov rdx,QWORD[(($L$poly+24))]
35113511
adox r14,rcx
35123512
shlx rcx,r8,rsi
35133513
adox r15,rax
35143514
shrx rax,r8,rsi
3515-
mov rbp,QWORD[(($L$poly+24))]
3515+
mov rbp,rdx
35163516

35173517

35183518
add r9,rcx
35193519
adc r10,rax
35203520

3521-
mulx r8,rcx,rbp
3522-
mov rdx,r9
3521+
mulx r8,rcx,r8
35233522
adc r11,rcx
35243523
shlx rcx,r9,rsi
35253524
adc r8,0
@@ -3529,8 +3528,7 @@ DB 0x67,0x67
35293528
add r10,rcx
35303529
adc r11,rax
35313530

3532-
mulx r9,rcx,rbp
3533-
mov rdx,r10
3531+
mulx r9,rcx,r9
35343532
adc r8,rcx
35353533
shlx rcx,r10,rsi
35363534
adc r9,0
@@ -3540,8 +3538,7 @@ DB 0x67,0x67
35403538
add r11,rcx
35413539
adc r8,rax
35423540

3543-
mulx r10,rcx,rbp
3544-
mov rdx,r11
3541+
mulx r10,rcx,r10
35453542
adc r9,rcx
35463543
shlx rcx,r11,rsi
35473544
adc r10,0
@@ -3551,12 +3548,12 @@ DB 0x67,0x67
35513548
add r8,rcx
35523549
adc r9,rax
35533550

3554-
mulx r11,rcx,rbp
3551+
mulx r11,rcx,r11
35553552
adc r10,rcx
35563553
adc r11,0
35573554

35583555
xor rdx,rdx
3559-
adc r12,r8
3556+
add r12,r8
35603557
mov rsi,QWORD[(($L$poly+8))]
35613558
adc r13,r9
35623559
mov r8,r12
@@ -3565,8 +3562,7 @@ DB 0x67,0x67
35653562
mov r9,r13
35663563
adc rdx,0
35673564

3568-
xor eax,eax
3569-
sbb r12,-1
3565+
sub r12,-1
35703566
mov r10,r14
35713567
sbb r13,rsi
35723568
sbb r14,0

‎SMP/crypto/x86_64-mont5.asm‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3166,11 +3166,19 @@ DB 0x67
31663166

31673167
ALIGN 32
31683168
$L$sqrx8x_break:
3169-
sub r8,QWORD[((16+8))+rsp]
3169+
xor rbp,rbp
3170+
sub rbx,QWORD[((16+8))+rsp]
3171+
adcx r8,rbp
31703172
mov rcx,QWORD[((24+8))+rsp]
3173+
adcx r9,rbp
31713174
mov rdx,QWORD[rsi]
3172-
xor ebp,ebp
3175+
adc r10,0
31733176
mov QWORD[rdi],r8
3177+
adc r11,0
3178+
adc r12,0
3179+
adc r13,0
3180+
adc r14,0
3181+
adc r15,0
31743182
cmp rdi,rcx
31753183
je NEAR $L$sqrx8x_outer_loop
31763184

‎SMP/crypto/x86_64cpuid.asm‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,19 @@ $L$nocacheinfo:
128128
or edx,0x40000000
129129
and ah,15
130130
cmp ah,15
131-
jne NEAR $L$notintel
131+
jne NEAR $L$notP4
132132
or edx,0x00100000
133+
$L$notP4:
134+
cmp ah,6
135+
jne NEAR $L$notintel
136+
and eax,0x0fff0ff0
137+
cmp eax,0x00050670
138+
je NEAR $L$knights
139+
cmp eax,0x00080650
140+
jne NEAR $L$notintel
141+
$L$knights:
142+
and ecx,0xfbffffff
143+
133144
$L$notintel:
134145
bt edx,28
135146
jnc NEAR $L$generic
@@ -154,6 +165,10 @@ $L$generic:
154165
mov eax,7
155166
xor ecx,ecx
156167
cpuid
168+
bt r9d,26
169+
jc NEAR $L$notknights
170+
and ebx,0xfff7ffff
171+
$L$notknights:
157172
mov DWORD[8+rdi],ebx
158173
$L$no_extended_info:
159174

‎SMP/libcrypto.def‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -876,6 +876,7 @@ EXPORTS
876876
CRYPTO_realloc
877877
CRYPTO_secure_actual_size
878878
CRYPTO_secure_allocated
879+
CRYPTO_secure_clear_free
879880
CRYPTO_secure_free
880881
CRYPTO_secure_malloc
881882
CRYPTO_secure_malloc_done
@@ -905,10 +906,12 @@ EXPORTS
905906
CT_POLICY_EVAL_CTX_get0_cert
906907
CT_POLICY_EVAL_CTX_get0_issuer
907908
CT_POLICY_EVAL_CTX_get0_log_store
909+
CT_POLICY_EVAL_CTX_get_time
908910
CT_POLICY_EVAL_CTX_new
909911
CT_POLICY_EVAL_CTX_set1_cert
910912
CT_POLICY_EVAL_CTX_set1_issuer
911913
CT_POLICY_EVAL_CTX_set_shared_CTLOG_STORE
914+
CT_POLICY_EVAL_CTX_set_time
912915
Camellia_cbc_encrypt
913916
Camellia_cfb128_encrypt
914917
Camellia_cfb1_encrypt
@@ -956,6 +959,7 @@ EXPORTS
956959
DH_OpenSSL
957960
DH_bits
958961
DH_check
962+
DH_check_params
959963
DH_check_pub_key
960964
DH_clear_flags
961965
DH_compute_key
@@ -1095,13 +1099,15 @@ EXPORTS
10951099
DSO_bind_func
10961100
DSO_convert_filename
10971101
DSO_ctrl
1102+
DSO_dsobyaddr
10981103
DSO_flags
10991104
DSO_free
11001105
DSO_get_filename
11011106
DSO_global_lookup
11021107
DSO_load
11031108
DSO_merge
11041109
DSO_new
1110+
DSO_pathbyaddr
11051111
DSO_set_filename
11061112
DSO_up_ref
11071113
ECDH_KDF_X9_62
@@ -1732,6 +1738,7 @@ EXPORTS
17321738
EVP_PKEY_set1_DSA
17331739
EVP_PKEY_set1_EC_KEY
17341740
EVP_PKEY_set1_RSA
1741+
EVP_PKEY_set1_engine
17351742
EVP_PKEY_set1_tls_encodedpoint
17361743
EVP_PKEY_set_type
17371744
EVP_PKEY_set_type_str
@@ -1923,6 +1930,8 @@ EXPORTS
19231930
IDEA_options
19241931
IDEA_set_decrypt_key
19251932
IDEA_set_encrypt_key
1933+
INT32_it
1934+
INT64_it
19261935
IPAddressChoice_free
19271936
IPAddressChoice_it
19281937
IPAddressChoice_new
@@ -2088,7 +2097,10 @@ EXPORTS
20882097
OCSP_RESPDATA_new
20892098
OCSP_RESPID_free
20902099
OCSP_RESPID_it
2100+
OCSP_RESPID_match
20912101
OCSP_RESPID_new
2102+
OCSP_RESPID_set_by_key
2103+
OCSP_RESPID_set_by_name
20922104
OCSP_RESPONSE_free
20932105
OCSP_RESPONSE_it
20942106
OCSP_RESPONSE_new
@@ -2950,6 +2962,8 @@ EXPORTS
29502962
TXT_DB_insert
29512963
TXT_DB_read
29522964
TXT_DB_write
2965+
UINT32_it
2966+
UINT64_it
29532967
UI_OpenSSL
29542968
UI_UTIL_read_pw
29552969
UI_UTIL_read_pw_string
@@ -3418,6 +3432,8 @@ EXPORTS
34183432
X509_VERIFY_PARAM_get_count
34193433
X509_VERIFY_PARAM_get_depth
34203434
X509_VERIFY_PARAM_get_flags
3435+
X509_VERIFY_PARAM_get_inh_flags
3436+
X509_VERIFY_PARAM_get_time
34213437
X509_VERIFY_PARAM_inherit
34223438
X509_VERIFY_PARAM_lookup
34233439
X509_VERIFY_PARAM_move_peername
@@ -3433,6 +3449,7 @@ EXPORTS
34333449
X509_VERIFY_PARAM_set_depth
34343450
X509_VERIFY_PARAM_set_flags
34353451
X509_VERIFY_PARAM_set_hostflags
3452+
X509_VERIFY_PARAM_set_inh_flags
34363453
X509_VERIFY_PARAM_set_purpose
34373454
X509_VERIFY_PARAM_set_time
34383455
X509_VERIFY_PARAM_set_trust
@@ -3605,7 +3622,11 @@ EXPORTS
36053622
X509v3_get_ext_by_OBJ
36063623
X509v3_get_ext_by_critical
36073624
X509v3_get_ext_count
3625+
ZINT32_it
3626+
ZINT64_it
36083627
ZLONG_it
3628+
ZUINT32_it
3629+
ZUINT64_it
36093630
_shadow_DES_check_key
36103631
a2d_ASN1_OBJECT
36113632
a2i_ASN1_ENUMERATED
@@ -4031,23 +4052,4 @@ EXPORTS
40314052
v2i_GENERAL_NAMES
40324053
v2i_GENERAL_NAME
40334054
v2i_GENERAL_NAME_ex
4034-
OCSP_RESPID_match
4035-
OCSP_RESPID_set_by_key
4036-
OCSP_RESPID_set_by_name
4037-
DSO_dsobyaddr
4038-
DSO_pathbyaddr
4039-
CT_POLICY_EVAL_CTX_get_time
4040-
CT_POLICY_EVAL_CTX_set_time
4041-
DH_check_params
4042-
X509_VERIFY_PARAM_get_inh_flags
4043-
X509_VERIFY_PARAM_get_time
4044-
X509_VERIFY_PARAM_set_inh_flags
4045-
INT32_it
4046-
INT64_it
4047-
UINT32_it
4048-
UINT64_it
4049-
ZINT32_it
4050-
ZINT64_it
4051-
ZUINT32_it
4052-
ZUINT64_it
40534055

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

‎SMP/libssl.def‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ EXPORTS
3939
SSL_CIPHER_get_version
4040
SSL_CIPHER_is_aead
4141
SSL_COMP_add_compression_method
42+
SSL_COMP_get0_name
4243
SSL_COMP_get_compression_methods
44+
SSL_COMP_get_id
4345
SSL_COMP_get_name
4446
SSL_COMP_set0_compression_methods
4547
SSL_CONF_CTX_clear_flags
@@ -403,6 +405,4 @@ EXPORTS
403405
TLSv1_server_method
404406
d2i_SSL_SESSION
405407
i2d_SSL_SESSION
406-
SSL_COMP_get0_name
407-
SSL_COMP_get_id
408408

‎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,6
7-
PRODUCTVERSION 1,1,0,6
6+
FILEVERSION 1,1,0,7
7+
PRODUCTVERSION 1,1,0,7
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.0f\0"
25+
VALUE "FileVersion", "1.1.0g\0"
2626
VALUE "InternalName", "libssl\0"
2727
VALUE "OriginalFilename", "libssl.dll\0"
2828
VALUE "ProductName", "The OpenSSL Toolkit\0"
29-
VALUE "ProductVersion", "1.1.0f\0"
29+
VALUE "ProductVersion", "1.1.0g\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)