gnu: OpenSSL: Remove replacement.
* gnu/packages/tls.scm (openssl): Update to 1.1.1k. [replacement]: Remove. (openssl-1.1.1k): Remove variable.
This commit is contained in:
		
							parent
							
								
									8ceff70007
								
							
						
					
					
						commit
						6a7a7c9d8f
					
				
					 1 changed files with 2 additions and 22 deletions
				
			
		| 
						 | 
					@ -311,8 +311,7 @@ required structures.")
 | 
				
			||||||
(define-public openssl
 | 
					(define-public openssl
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
   (name "openssl")
 | 
					   (name "openssl")
 | 
				
			||||||
   (version "1.1.1j")
 | 
					   (version "1.1.1k")
 | 
				
			||||||
   (replacement openssl-1.1.1k)
 | 
					 | 
				
			||||||
   (source (origin
 | 
					   (source (origin
 | 
				
			||||||
             (method url-fetch)
 | 
					             (method url-fetch)
 | 
				
			||||||
             (uri (list (string-append "https://www.openssl.org/source/openssl-"
 | 
					             (uri (list (string-append "https://www.openssl.org/source/openssl-"
 | 
				
			||||||
| 
						 | 
					@ -325,7 +324,7 @@ required structures.")
 | 
				
			||||||
             (patches (search-patches "openssl-1.1-c-rehash-in.patch"))
 | 
					             (patches (search-patches "openssl-1.1-c-rehash-in.patch"))
 | 
				
			||||||
             (sha256
 | 
					             (sha256
 | 
				
			||||||
              (base32
 | 
					              (base32
 | 
				
			||||||
               "1gw17520vh13izy1xf5q0a2fqgcayymjjj5bk0dlkxndfnszrwma"))))
 | 
					               "1rdfzcrxy9y38wqdw5942vmdax9hjhgrprzxm42csal7p5shhal9"))))
 | 
				
			||||||
   (build-system gnu-build-system)
 | 
					   (build-system gnu-build-system)
 | 
				
			||||||
   (outputs '("out"
 | 
					   (outputs '("out"
 | 
				
			||||||
              "doc"         ;6.8 MiB of man3 pages and full HTML documentation
 | 
					              "doc"         ;6.8 MiB of man3 pages and full HTML documentation
 | 
				
			||||||
| 
						 | 
					@ -446,25 +445,6 @@ required structures.")
 | 
				
			||||||
   (license license:openssl)
 | 
					   (license license:openssl)
 | 
				
			||||||
   (home-page "https://www.openssl.org/")))
 | 
					   (home-page "https://www.openssl.org/")))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
;; Replacement package to fix CVE-2021-3449 and CVE-2021-3450.
 | 
					 | 
				
			||||||
(define openssl-1.1.1k
 | 
					 | 
				
			||||||
  (package
 | 
					 | 
				
			||||||
    (inherit openssl)
 | 
					 | 
				
			||||||
    (version "1.1.1k")
 | 
					 | 
				
			||||||
    (source (origin
 | 
					 | 
				
			||||||
              (method url-fetch)
 | 
					 | 
				
			||||||
              (uri (list (string-append "https://www.openssl.org/source/openssl-"
 | 
					 | 
				
			||||||
                                        version ".tar.gz")
 | 
					 | 
				
			||||||
                         (string-append "ftp://ftp.openssl.org/source/"
 | 
					 | 
				
			||||||
                                        "openssl-" version ".tar.gz")
 | 
					 | 
				
			||||||
                         (string-append "ftp://ftp.openssl.org/source/old/"
 | 
					 | 
				
			||||||
                                        (string-trim-right version char-set:letter)
 | 
					 | 
				
			||||||
                                        "/openssl-" version ".tar.gz")))
 | 
					 | 
				
			||||||
              (patches (search-patches "openssl-1.1-c-rehash-in.patch"))
 | 
					 | 
				
			||||||
              (sha256
 | 
					 | 
				
			||||||
               (base32
 | 
					 | 
				
			||||||
                "1rdfzcrxy9y38wqdw5942vmdax9hjhgrprzxm42csal7p5shhal9"))))))
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
(define-public openssl-1.0
 | 
					(define-public openssl-1.0
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (inherit openssl)
 | 
					    (inherit openssl)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Reference in a new issue