diff --git a/.gitignore b/.gitignore
index aef9e25..adb9771 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,10 @@
 /crypto-9419663f5a44be8b34ca85f08abc5fe1be11f8a3.tar.gz
 /crypto-88942b9c40a4c9d203b82b3731787b672d6e809b.tar.gz
 /crypto-a49355c7e3f8fe157a85be2f77e6e269a0f89602.tar.gz
+<<<<<<< HEAD
+=======
+/crypto-e3636079e1a4c1f337f212cc5cd2aca108f6c900.tar.gz
+/crypto-e84da0312774c21d64ee2317962ef669b27ffb41.tar.gz
+/crypto-8dd112bcdc25174059e45e07517d9fc663123347.tar.gz
+/crypto-b7391e95e576cacdcdd422573063bc057239113d.tar.gz
+>>>>>>> 4aa95b9... Bump to commit b7391e95e576cacdcdd422573063bc057239113d
diff --git a/golang-googlecode-go-crypto.spec b/golang-googlecode-go-crypto.spec
index a4de263..3a6fedc 100644
--- a/golang-googlecode-go-crypto.spec
+++ b/golang-googlecode-go-crypto.spec
@@ -1,27 +1,29 @@
 # https://github.com/golang/crypto
 %global forgeurl        https://github.com/golang/crypto
 %global goipath         golang.org/x/crypto
-%global commit          a49355c7e3f8fe157a85be2f77e6e269a0f89602
+%global commit          b7391e95e576cacdcdd422573063bc057239113d
 %global x_name          golang-golangorg-crypto
 
 %gometa
 
 Name:           golang-googlecode-go-crypto
 Version:        0
-Release:        0.24%{?dist}
+Release:        0.25%{?dist}
 Summary:        Supplementary Go cryptography libraries
 License:        BSD
 URL:            %{gourl}
 Source0:        %{gosource}
 
+BuildRequires: golang(golang.org/x/sys/cpu)
+BuildRequires: golang(golang.org/x/sys/unix)
+
 %description
 %{summary}
 
+
 %package -n %{x_name}-devel
 Summary:       %{summary}
 
-BuildRequires: golang(golang.org/x/sys/unix)
-
 %description -n %{x_name}-devel
 %{summary}
 
@@ -29,25 +31,30 @@ This package contains library source intended for
 building other packages which use import path with
 %{goipath} prefix.
 
+
 %prep
 %forgesetup
 
+
 %install
 %goinstall
 
+
 %check
-%gochecks -d chacha20poly1305 -d ocsp -d ssh
+%gochecks
 
-#define license tag if not already defined
-%{!?_licensedir:%global license %doc}
 
 %files -n %{x_name}-devel -f devel.file-list
 %license LICENSE
 %doc *.md AUTHORS CONTRIBUTORS
 
+
 %changelog
-* Tue Oct 23 2018 Nicolas Mailhot <nim@fedoraproject.org>
-- 0-0.24
+* Sun Mar 24 18:28:52 CET 2019 Robert-André Mauchin <zebob.m@gmail.com> - 0-0.25.20190324gitb7391e9
+- Bump to commit b7391e95e576cacdcdd422573063bc057239113d
+- Security fix for #1691529 and #1691530.
+
+* Tue Oct 23 2018 Nicolas Mailhot <nim@fedoraproject.org> - 0-0.24.gita49355c
 - redhat-rpm-config-123 triggers bugs in gosetup, remove it from Go spec files as it’s just an alias
 - https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/RWD5YATAYAFWKIDZBB7EB6N5DAO4ZKFM/
 
diff --git a/sources b/sources
index 914e328..dd99b6e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (crypto-a49355c7e3f8fe157a85be2f77e6e269a0f89602.tar.gz) = f0bc47b24009aad58da61568a6331684a7807554706a294ed24a9061b7c0d1364243b1ff9b3248c5485ff4668bb76f41a86664e13ace27843be4c3e7e84abfef
+SHA512 (crypto-b7391e95e576cacdcdd422573063bc057239113d.tar.gz) = 618f3e52f3ac30acfbfbbae81702cf7bb09bcfdc20f7c932a1eb21fee9e2d56d139e55a443a184c6cafcdac325f83ec621477f7f52f1d962c0b6dfa3c7c718d9