summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2016-08-03 00:06:47 -0700
committerMichael Forney <mforney@mforney.org>2016-08-03 00:36:21 -0700
commitc493fdf426310f16eee3e786502af1367b487baf (patch)
tree515ec69f75ec5416ec44628d5b5f40ae581d5560
parent8c82766b8a4da1d5f2b737203f37a6ec000c053b (diff)
libressl: Update to 2.4.2
-rw-r--r--core/libressl/.rev2
-rw-r--r--core/libressl/patch/0001-Add-generated-obj_-dat-mac-.h-from-libressl-2.4.2-di.patch (renamed from core/libressl/patch/0001-Add-generated-obj_-dat-mac-.h-from-libressl-2.4.1-di.patch)6
m---------core/libressl/src0
3 files changed, 4 insertions, 4 deletions
diff --git a/core/libressl/.rev b/core/libressl/.rev
index d00491fd..0cfbf088 100644
--- a/core/libressl/.rev
+++ b/core/libressl/.rev
@@ -1 +1 @@
-1
+2
diff --git a/core/libressl/patch/0001-Add-generated-obj_-dat-mac-.h-from-libressl-2.4.1-di.patch b/core/libressl/patch/0001-Add-generated-obj_-dat-mac-.h-from-libressl-2.4.2-di.patch
index 7af5e10d..4f638b94 100644
--- a/core/libressl/patch/0001-Add-generated-obj_-dat-mac-.h-from-libressl-2.4.1-di.patch
+++ b/core/libressl/patch/0001-Add-generated-obj_-dat-mac-.h-from-libressl-2.4.2-di.patch
@@ -1,7 +1,7 @@
-From fc2b6cbb3d2240242f2304436e063b258f783767 Mon Sep 17 00:00:00 2001
+From 2e4c63fda4c6531feb78af2a0004e72d49343844 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Tue, 14 Jun 2016 21:17:48 -0700
-Subject: [PATCH] Add generated obj_{dat,mac}.h from libressl 2.4.1
+Subject: [PATCH] Add generated obj_{dat,mac}.h from libressl 2.4.2
distribution
---
@@ -9446,5 +9446,5 @@ index 0000000..f727262
+#define OBJ_id_tc26_signwithdigest_gost3410_2012_512 OBJ_tc26,1L,3L,3L
+
--
-2.8.1
+2.9.2
diff --git a/core/libressl/src b/core/libressl/src
-Subproject 075f24fcf49c54c48e55cd724e413880ebaffba
+Subproject f00905854815243d9f51855e1241f675219ee9d