 74d00a8c38
			
		
	
	74d00a8c38
	
	
	
		
			
			* properly format/comment all patches * merge debloat patches * merge Kconfig patches * merge swconfig patches * merge hotplug patches * drop 200-fix_localversion.patch - upstream * drop 222-arm_zimage_none.patch - unused * drop 252-mv_cesa_depends.patch - no longer required * drop 410-mtd-move-forward-declaration-of-struct-mtd_info.patch - unused * drop 661-fq_codel_keep_dropped_stats.patch - outdated * drop 702-phy_add_aneg_done_function.patch - upstream * drop 840-rtc7301.patch - unused * drop 841-rtc_pt7c4338.patch - upstream * drop 921-use_preinit_as_init.patch - unused * drop spio-gpio-old and gpio-mmc - unused Signed-off-by: John Crispin <john@phrozen.org>
		
			
				
	
	
		
			17 lines
		
	
	
		
			482 B
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			17 lines
		
	
	
		
			482 B
		
	
	
	
		
			Diff
		
	
	
	
	
	
| LibreSSL disables the CMS subsystem, so sign-file.c needs to fall back to using
 | |
| PKCS#7 in that case.
 | |
| 
 | |
| Signed-off-by: Felix Fietkau <nbd@nbd.name>
 | |
| 
 | |
| --- a/scripts/sign-file.c
 | |
| +++ b/scripts/sign-file.c
 | |
| @@ -39,7 +39,7 @@
 | |
|   * signing with anything other than SHA1 - so we're stuck with that if such is
 | |
|   * the case.
 | |
|   */
 | |
| -#if OPENSSL_VERSION_NUMBER < 0x10000000L
 | |
| +#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10000000L
 | |
|  #define USE_PKCS7
 | |
|  #endif
 | |
|  #ifndef USE_PKCS7
 |