Attachment #520038 for bug #648016

View | Details | Raw Unified | Return to bug 648016
Collapse All | Expand All

Lines 122-127 main(int argc, char *argv[]) Link Here

(-)a/cert-to-efi-hash-list.c (+2 lines)
122	timestamp.Month, timestamp.Day, timestamp.Hour, timestamp.Minute,	122	timestamp.Month, timestamp.Day, timestamp.Hour, timestamp.Minute,
123	timestamp.Second);	123	timestamp.Second);
124		124
		125	#if OPENSSL_VERSION_NUMBER < 0x10100000L
125	ERR_load_crypto_strings();	126	ERR_load_crypto_strings();
126	OpenSSL_add_all_digests();	127	OpenSSL_add_all_digests();
127	OpenSSL_add_all_ciphers();	128	OpenSSL_add_all_ciphers();
Lines 130-135 main(int argc, char *argv[]) Link Here
130	* module isn't present). In either case ignore the errors	131	* module isn't present). In either case ignore the errors
131	* (malloc will cause other failures out lower down */	132	* (malloc will cause other failures out lower down */
132	ERR_clear_error();	133	ERR_clear_error();
		134	#endif
133		135
134	BIO *cert_bio = BIO_new_file(certfile, "r");	136	BIO *cert_bio = BIO_new_file(certfile, "r");
135	X509 *cert = PEM_read_bio_X509(cert_bio, NULL, NULL, NULL);	137	X509 *cert = PEM_read_bio_X509(cert_bio, NULL, NULL, NULL);

Lines 78-83 main(int argc, char *argv[]) Link Here

(-)a/cert-to-efi-sig-list.c (+2 lines)
78	certfile = argv[1];	78	certfile = argv[1];
79	efifile = argv[2];	79	efifile = argv[2];
80		80
		81	#if OPENSSL_VERSION_NUMBER < 0x10100000L
81	ERR_load_crypto_strings();	82	ERR_load_crypto_strings();
82	OpenSSL_add_all_digests();	83	OpenSSL_add_all_digests();
83	OpenSSL_add_all_ciphers();	84	OpenSSL_add_all_ciphers();
Lines 86-91 main(int argc, char *argv[]) Link Here
86	* module isn't present). In either case ignore the errors	87	* module isn't present). In either case ignore the errors
87	* (malloc will cause other failures out lower down */	88	* (malloc will cause other failures out lower down */
88	ERR_clear_error();	89	ERR_clear_error();
		90	#endif
89		91
90	BIO *cert_bio = BIO_new_file(certfile, "r");	92	BIO *cert_bio = BIO_new_file(certfile, "r");
91	X509 *cert = PEM_read_bio_X509(cert_bio, NULL, NULL, NULL);	93	X509 *cert = PEM_read_bio_X509(cert_bio, NULL, NULL, NULL);

Lines 146-154 main(int argc, char *argv[]) Link Here

(-)a/efi-updatevar.c (+2 lines)
146	}	146	}
147		147
148	kernel_variable_init();	148	kernel_variable_init();
		149	#if OPENSSL_VERSION_NUMBER < 0x10100000L
149	ERR_load_crypto_strings();	150	ERR_load_crypto_strings();
150	OpenSSL_add_all_digests();	151	OpenSSL_add_all_digests();
151	OpenSSL_add_all_ciphers();	152	OpenSSL_add_all_ciphers();
		153	#endif
152		154
153	name = file ? file : hash_mode;	155	name = file ? file : hash_mode;
154	if (delsig != -1) {	156	if (delsig != -1) {

Lines 248-253 main(int argc, char *argv[]) Link Here

(-)a/sign-efi-sig-list.c (+2 lines)
248	exit(1);	248	exit(1);
249	}	249	}
250		250
		251	#if OPENSSL_VERSION_NUMBER < 0x10100000L
251	ERR_load_crypto_strings();	252	ERR_load_crypto_strings();
252	OpenSSL_add_all_digests();	253	OpenSSL_add_all_digests();
253	OpenSSL_add_all_ciphers();	254	OpenSSL_add_all_ciphers();
Lines 256-261 main(int argc, char *argv[]) Link Here
256	* module isn't present). In either case ignore the errors	257	* module isn't present). In either case ignore the errors
257	* (malloc will cause other failures out lower down */	258	* (malloc will cause other failures out lower down */
258	ERR_clear_error();	259	ERR_clear_error();
		260	#endif
259		261
260	BIO *cert_bio = BIO_new_file(certfile, "r");	262	BIO *cert_bio = BIO_new_file(certfile, "r");
261	X509 *cert = PEM_read_bio_X509(cert_bio, NULL, NULL, NULL);	263	X509 *cert = PEM_read_bio_X509(cert_bio, NULL, NULL, NULL);

Return to bug 648016