1 diff -ruN a/CryptoPkg/CryptoPkg.dec b/CryptoPkg/CryptoPkg.dec
2 --- a/CryptoPkg/CryptoPkg.dec 2020-06-02 09:05:21.000000000 +0200
3 +++ b/CryptoPkg/CryptoPkg.dec 2020-06-09 15:21:52.055912797 +0200
7 Library/OpensslLib/openssl/include
\r
8 - Library/OpensslLib/openssl/crypto/include
\r
11 ## @libraryclass Provides basic library functions for cryptographic primitives.
\r
12 diff -ruN a/CryptoPkg/Library/BaseCryptLib/Hash/CryptSm3.c b/CryptoPkg/Library/BaseCryptLib/Hash/CryptSm3.c
13 --- a/CryptoPkg/Library/BaseCryptLib/Hash/CryptSm3.c 2020-06-02 09:05:21.000000000 +0200
14 +++ b/CryptoPkg/Library/BaseCryptLib/Hash/CryptSm3.c 2020-06-09 15:26:52.686439106 +0200
18 #include "InternalCryptLib.h"
\r
19 -#include "internal/sm3.h"
\r
20 +#include <crypto/sm3.h>
\r
23 Retrieves the size, in bytes, of the context buffer required for SM3 hash operations.
\r
24 diff -ruN a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEku.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEku.c
25 --- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEku.c 2020-06-02 09:05:21.000000000 +0200
26 +++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEku.c 2020-06-09 15:22:47.512057737 +0200
28 #include <openssl/asn1.h>
\r
29 #include <openssl/x509.h>
\r
30 #include <openssl/bio.h>
\r
31 -#include <internal/x509_int.h>
\r
32 #include <openssl/pkcs7.h>
\r
33 #include <openssl/bn.h>
\r
34 #include <openssl/x509_vfy.h>
\r
35 #include <openssl/pem.h>
\r
36 #include <openssl/evp.h>
\r
37 -#include <internal/asn1_int.h>
\r
38 +#include <crypto/asn1.h>
\r
41 This function will return the leaf signer certificate in a chain. This is
\r
42 diff -ruN a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
43 --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf 2020-06-02 09:05:21.000000000 +0200
44 +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf 2020-06-09 11:08:33.349121703 +0200
46 $(OPENSSL_PATH)/crypto/s390x_arch.h
\r
47 $(OPENSSL_PATH)/crypto/sparc_arch.h
\r
48 $(OPENSSL_PATH)/crypto/vms_rms.h
\r
49 - $(OPENSSL_PATH)/crypto/aes/aes_locl.h
\r
50 + $(OPENSSL_PATH)/crypto/aes/aes_local.h
\r
51 $(OPENSSL_PATH)/crypto/asn1/asn1_item_list.h
\r
52 - $(OPENSSL_PATH)/crypto/asn1/asn1_locl.h
\r
53 + $(OPENSSL_PATH)/crypto/asn1/asn1_local.h
\r
54 $(OPENSSL_PATH)/crypto/asn1/charmap.h
\r
55 $(OPENSSL_PATH)/crypto/asn1/standard_methods.h
\r
56 $(OPENSSL_PATH)/crypto/asn1/tbl_standard.h
\r
57 - $(OPENSSL_PATH)/crypto/async/async_locl.h
\r
58 + $(OPENSSL_PATH)/crypto/async/async_local.h
\r
59 $(OPENSSL_PATH)/crypto/async/arch/async_null.h
\r
60 $(OPENSSL_PATH)/crypto/async/arch/async_posix.h
\r
61 $(OPENSSL_PATH)/crypto/async/arch/async_win.h
\r
62 - $(OPENSSL_PATH)/crypto/bio/bio_lcl.h
\r
63 - $(OPENSSL_PATH)/crypto/bn/bn_lcl.h
\r
64 + $(OPENSSL_PATH)/crypto/bio/bio_local.h
\r
65 + $(OPENSSL_PATH)/crypto/bn/bn_local.h
\r
66 $(OPENSSL_PATH)/crypto/bn/bn_prime.h
\r
67 $(OPENSSL_PATH)/crypto/bn/rsaz_exp.h
\r
68 - $(OPENSSL_PATH)/crypto/comp/comp_lcl.h
\r
69 + $(OPENSSL_PATH)/crypto/comp/comp_local.h
\r
70 $(OPENSSL_PATH)/crypto/conf/conf_def.h
\r
71 - $(OPENSSL_PATH)/crypto/conf/conf_lcl.h
\r
72 - $(OPENSSL_PATH)/crypto/dh/dh_locl.h
\r
73 - $(OPENSSL_PATH)/crypto/dso/dso_locl.h
\r
74 - $(OPENSSL_PATH)/crypto/evp/evp_locl.h
\r
75 - $(OPENSSL_PATH)/crypto/hmac/hmac_lcl.h
\r
76 - $(OPENSSL_PATH)/crypto/lhash/lhash_lcl.h
\r
77 - $(OPENSSL_PATH)/crypto/md5/md5_locl.h
\r
78 - $(OPENSSL_PATH)/crypto/modes/modes_lcl.h
\r
79 + $(OPENSSL_PATH)/crypto/conf/conf_local.h
\r
80 + $(OPENSSL_PATH)/crypto/dh/dh_local.h
\r
81 + $(OPENSSL_PATH)/crypto/dso/dso_local.h
\r
82 + $(OPENSSL_PATH)/crypto/evp/evp_local.h
\r
83 + $(OPENSSL_PATH)/crypto/hmac/hmac_local.h
\r
84 + $(OPENSSL_PATH)/crypto/lhash/lhash_local.h
\r
85 + $(OPENSSL_PATH)/crypto/md5/md5_local.h
\r
86 + $(OPENSSL_PATH)/crypto/modes/modes_local.h
\r
87 $(OPENSSL_PATH)/crypto/objects/obj_dat.h
\r
88 - $(OPENSSL_PATH)/crypto/objects/obj_lcl.h
\r
89 + $(OPENSSL_PATH)/crypto/objects/obj_local.h
\r
90 $(OPENSSL_PATH)/crypto/objects/obj_xref.h
\r
91 - $(OPENSSL_PATH)/crypto/ocsp/ocsp_lcl.h
\r
92 - $(OPENSSL_PATH)/crypto/pkcs12/p12_lcl.h
\r
93 - $(OPENSSL_PATH)/crypto/rand/rand_lcl.h
\r
94 - $(OPENSSL_PATH)/crypto/rsa/rsa_locl.h
\r
95 - $(OPENSSL_PATH)/crypto/sha/sha_locl.h
\r
96 + $(OPENSSL_PATH)/crypto/ocsp/ocsp_local.h
\r
97 + $(OPENSSL_PATH)/crypto/pkcs12/p12_local.h
\r
98 + $(OPENSSL_PATH)/crypto/rand/rand_local.h
\r
99 + $(OPENSSL_PATH)/crypto/rsa/rsa_local.h
\r
100 + $(OPENSSL_PATH)/crypto/sha/sha_local.h
\r
101 $(OPENSSL_PATH)/crypto/siphash/siphash_local.h
\r
102 - $(OPENSSL_PATH)/crypto/sm3/sm3_locl.h
\r
103 - $(OPENSSL_PATH)/crypto/store/store_locl.h
\r
104 - $(OPENSSL_PATH)/crypto/ui/ui_locl.h
\r
105 - $(OPENSSL_PATH)/crypto/x509/x509_lcl.h
\r
106 + $(OPENSSL_PATH)/crypto/sm3/sm3_local.h
\r
107 + $(OPENSSL_PATH)/crypto/store/store_local.h
\r
108 + $(OPENSSL_PATH)/crypto/ui/ui_local.h
\r
109 + $(OPENSSL_PATH)/crypto/x509/x509_local.h
\r
110 $(OPENSSL_PATH)/crypto/x509v3/ext_dat.h
\r
111 - $(OPENSSL_PATH)/crypto/x509v3/pcy_int.h
\r
112 $(OPENSSL_PATH)/crypto/x509v3/standard_exts.h
\r
113 $(OPENSSL_PATH)/crypto/x509v3/v3_admis.h
\r
114 $(OPENSSL_PATH)/ssl/bio_ssl.c
\r
115 @@ -562,13 +561,13 @@
116 $(OPENSSL_PATH)/ssl/t1_trce.c
\r
117 $(OPENSSL_PATH)/ssl/tls13_enc.c
\r
118 $(OPENSSL_PATH)/ssl/tls_srp.c
\r
119 - $(OPENSSL_PATH)/ssl/packet_locl.h
\r
120 + $(OPENSSL_PATH)/ssl/packet_local.h
\r
121 $(OPENSSL_PATH)/ssl/ssl_cert_table.h
\r
122 - $(OPENSSL_PATH)/ssl/ssl_locl.h
\r
123 + $(OPENSSL_PATH)/ssl/ssl_local.h
\r
124 $(OPENSSL_PATH)/ssl/record/record.h
\r
125 - $(OPENSSL_PATH)/ssl/record/record_locl.h
\r
126 + $(OPENSSL_PATH)/ssl/record/record_local.h
\r
127 $(OPENSSL_PATH)/ssl/statem/statem.h
\r
128 - $(OPENSSL_PATH)/ssl/statem/statem_locl.h
\r
129 + $(OPENSSL_PATH)/ssl/statem/statem_local.h
\r
130 # Autogenerated files list ends here
\r
133 diff -ruN a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
134 --- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf 2020-06-02 09:05:21.000000000 +0200
135 +++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf 2020-06-09 11:17:31.877356870 +0200
136 @@ -477,45 +477,44 @@
137 $(OPENSSL_PATH)/crypto/s390x_arch.h
\r
138 $(OPENSSL_PATH)/crypto/sparc_arch.h
\r
139 $(OPENSSL_PATH)/crypto/vms_rms.h
\r
140 - $(OPENSSL_PATH)/crypto/aes/aes_locl.h
\r
141 + $(OPENSSL_PATH)/crypto/aes/aes_local.h
\r
142 $(OPENSSL_PATH)/crypto/asn1/asn1_item_list.h
\r
143 - $(OPENSSL_PATH)/crypto/asn1/asn1_locl.h
\r
144 + $(OPENSSL_PATH)/crypto/asn1/asn1_local.h
\r
145 $(OPENSSL_PATH)/crypto/asn1/charmap.h
\r
146 $(OPENSSL_PATH)/crypto/asn1/standard_methods.h
\r
147 $(OPENSSL_PATH)/crypto/asn1/tbl_standard.h
\r
148 - $(OPENSSL_PATH)/crypto/async/async_locl.h
\r
149 + $(OPENSSL_PATH)/crypto/async/async_local.h
\r
150 $(OPENSSL_PATH)/crypto/async/arch/async_null.h
\r
151 $(OPENSSL_PATH)/crypto/async/arch/async_posix.h
\r
152 $(OPENSSL_PATH)/crypto/async/arch/async_win.h
\r
153 - $(OPENSSL_PATH)/crypto/bio/bio_lcl.h
\r
154 - $(OPENSSL_PATH)/crypto/bn/bn_lcl.h
\r
155 + $(OPENSSL_PATH)/crypto/bio/bio_local.h
\r
156 + $(OPENSSL_PATH)/crypto/bn/bn_local.h
\r
157 $(OPENSSL_PATH)/crypto/bn/bn_prime.h
\r
158 $(OPENSSL_PATH)/crypto/bn/rsaz_exp.h
\r
159 - $(OPENSSL_PATH)/crypto/comp/comp_lcl.h
\r
160 + $(OPENSSL_PATH)/crypto/comp/comp_local.h
\r
161 $(OPENSSL_PATH)/crypto/conf/conf_def.h
\r
162 - $(OPENSSL_PATH)/crypto/conf/conf_lcl.h
\r
163 - $(OPENSSL_PATH)/crypto/dh/dh_locl.h
\r
164 - $(OPENSSL_PATH)/crypto/dso/dso_locl.h
\r
165 - $(OPENSSL_PATH)/crypto/evp/evp_locl.h
\r
166 - $(OPENSSL_PATH)/crypto/hmac/hmac_lcl.h
\r
167 - $(OPENSSL_PATH)/crypto/lhash/lhash_lcl.h
\r
168 - $(OPENSSL_PATH)/crypto/md5/md5_locl.h
\r
169 - $(OPENSSL_PATH)/crypto/modes/modes_lcl.h
\r
170 + $(OPENSSL_PATH)/crypto/conf/conf_local.h
\r
171 + $(OPENSSL_PATH)/crypto/dh/dh_local.h
\r
172 + $(OPENSSL_PATH)/crypto/dso/dso_local.h
\r
173 + $(OPENSSL_PATH)/crypto/evp/evp_local.h
\r
174 + $(OPENSSL_PATH)/crypto/hmac/hmac_local.h
\r
175 + $(OPENSSL_PATH)/crypto/lhash/lhash_local.h
\r
176 + $(OPENSSL_PATH)/crypto/md5/md5_local.h
\r
177 + $(OPENSSL_PATH)/crypto/modes/modes_local.h
\r
178 $(OPENSSL_PATH)/crypto/objects/obj_dat.h
\r
179 - $(OPENSSL_PATH)/crypto/objects/obj_lcl.h
\r
180 + $(OPENSSL_PATH)/crypto/objects/obj_local.h
\r
181 $(OPENSSL_PATH)/crypto/objects/obj_xref.h
\r
182 - $(OPENSSL_PATH)/crypto/ocsp/ocsp_lcl.h
\r
183 - $(OPENSSL_PATH)/crypto/pkcs12/p12_lcl.h
\r
184 - $(OPENSSL_PATH)/crypto/rand/rand_lcl.h
\r
185 - $(OPENSSL_PATH)/crypto/rsa/rsa_locl.h
\r
186 - $(OPENSSL_PATH)/crypto/sha/sha_locl.h
\r
187 + $(OPENSSL_PATH)/crypto/ocsp/ocsp_local.h
\r
188 + $(OPENSSL_PATH)/crypto/pkcs12/p12_local.h
\r
189 + $(OPENSSL_PATH)/crypto/rand/rand_local.h
\r
190 + $(OPENSSL_PATH)/crypto/rsa/rsa_local.h
\r
191 + $(OPENSSL_PATH)/crypto/sha/sha_local.h
\r
192 $(OPENSSL_PATH)/crypto/siphash/siphash_local.h
\r
193 - $(OPENSSL_PATH)/crypto/sm3/sm3_locl.h
\r
194 - $(OPENSSL_PATH)/crypto/store/store_locl.h
\r
195 - $(OPENSSL_PATH)/crypto/ui/ui_locl.h
\r
196 - $(OPENSSL_PATH)/crypto/x509/x509_lcl.h
\r
197 + $(OPENSSL_PATH)/crypto/sm3/sm3_local.h
\r
198 + $(OPENSSL_PATH)/crypto/store/store_local.h
\r
199 + $(OPENSSL_PATH)/crypto/ui/ui_local.h
\r
200 + $(OPENSSL_PATH)/crypto/x509/x509_local.h
\r
201 $(OPENSSL_PATH)/crypto/x509v3/ext_dat.h
\r
202 - $(OPENSSL_PATH)/crypto/x509v3/pcy_int.h
\r
203 $(OPENSSL_PATH)/crypto/x509v3/standard_exts.h
\r
204 $(OPENSSL_PATH)/crypto/x509v3/v3_admis.h
\r
205 # Autogenerated files list ends here
\r
206 diff -ruN a/CryptoPkg/Library/OpensslLib/process_files.pl b/CryptoPkg/Library/OpensslLib/process_files.pl
207 --- a/CryptoPkg/Library/OpensslLib/process_files.pl 2020-06-02 09:05:21.000000000 +0200
208 +++ b/CryptoPkg/Library/OpensslLib/process_files.pl 2020-06-09 12:36:16.400775802 +0200
210 # Generate dso_conf.h per config data
\r
212 "perl -I. -Mconfigdata util/dofile.pl " .
\r
213 - "crypto/include/internal/dso_conf.h.in " .
\r
214 - "> include/internal/dso_conf.h"
\r
215 + "include/crypto/dso_conf.h.in " .
\r
216 + "> include/crypto/dso_conf.h"
\r
218 die "Failed to generate dso_conf.h!\n";
\r
220 diff -ruN a/CryptoPkg/Library/OpensslLib/rand_pool.c b/CryptoPkg/Library/OpensslLib/rand_pool.c
221 --- a/CryptoPkg/Library/OpensslLib/rand_pool.c 2020-06-02 09:05:21.000000000 +0200
222 +++ b/CryptoPkg/Library/OpensslLib/rand_pool.c 2020-06-17 21:00:46.335684557 +0200
227 -#include "internal/rand_int.h"
\r
228 #include <openssl/aes.h>
\r
230 +#include <crypto/rand.h>
\r
232 #include <Library/TimerLib.h>
\r
OSDN Git Service
