summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2023-10-11 19:17:00 -0400
committerJune McEnroe <june@causal.agency>2023-10-11 19:20:41 -0400
commit7314efbbff8888e2e9b9676b5ef8343c0f64554d (patch)
tree8033458e5c2407a746a6bd97853db77143074044
parentMerge LibreSSL 3.7.0 (diff)
parentImport LibreSSL 3.7.1 (diff)
downloadlibretls-7314efbbff8888e2e9b9676b5ef8343c0f64554d.tar.gz
libretls-7314efbbff8888e2e9b9676b5ef8343c0f64554d.zip
Merge LibreSSL 3.7.1
-rw-r--r--.gitignore1
-rw-r--r--LIBTLS_VERSION2
-rw-r--r--Makefile.am10
-rw-r--r--Makefile.am.common4
-rw-r--r--VERSION2
-rw-r--r--compat/getentropy_aix.c4
-rw-r--r--empty.c0
7 files changed, 18 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index 55f559c..5acc290 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@
 /configure
 /depcomp
 /install-sh
+/libtls_la_objects.mk
 /libtls.pc
 /libtool
 /ltmain.sh
diff --git a/LIBTLS_VERSION b/LIBTLS_VERSION
index ce7dc5a..bc4eb71 100644
--- a/LIBTLS_VERSION
+++ b/LIBTLS_VERSION
@@ -1 +1 @@
-26:1:0
+26:2:0
diff --git a/Makefile.am b/Makefile.am
index 69a8133..741cacb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,6 +13,16 @@ EXTRA_DIST += LIBTLS_VERSION
 EXTRA_DIST += tls.sym
 EXTRA_DIST += README.7
 EXTRA_DIST += scripts
+EXTRA_DIST += empty.c
+
+CLEANFILES = libtls_la_objects.mk
+
+EXTRA_libtls_la_DEPENDENCIES = libtls_la_objects.mk
+
+libtls_la_objects.mk: Makefile
+	@echo "libtls_la_objects= $(libtls_la_OBJECTS)" \
+	  | sed 's/  */ $$\(abs_top_builddir\)\/tls\//g' \
+	  > libtls_la_objects.mk
 
 libtls_la_LDFLAGS = -version-info @LIBTLS_VERSION@ -no-undefined -export-symbols $(top_srcdir)/tls.sym
 libtls_la_LDFLAGS += $(OPENSSL_LDFLAGS)
diff --git a/Makefile.am.common b/Makefile.am.common
index 87aa807..5405704 100644
--- a/Makefile.am.common
+++ b/Makefile.am.common
@@ -1,3 +1,5 @@
 AM_CFLAGS =
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/compat -DLIBRESSL_INTERNAL
+AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS += -I$(abs_top_builddir)/include
+AM_CPPFLAGS += -I$(top_srcdir)/include/compat -DLIBRESSL_INTERNAL
 AM_CPPFLAGS += -D__BEGIN_HIDDEN_DECLS= -D__END_HIDDEN_DECLS=
diff --git a/VERSION b/VERSION
index e17f512..679e070 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-3.7.0
+3.7.1
 
diff --git a/compat/getentropy_aix.c b/compat/getentropy_aix.c
index 7fb857e..9d085cf 100644
--- a/compat/getentropy_aix.c
+++ b/compat/getentropy_aix.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getentropy_aix.c,v 1.8 2021/10/24 21:24:20 deraadt Exp $	*/
+/*	$OpenBSD: getentropy_aix.c,v 1.9 2022/12/26 07:18:50 jmc Exp $	*/
 
 /*
  * Copyright (c) 2015 Michael Felt <aixtools@gmail.com>
@@ -21,7 +21,7 @@
  * http://man.openbsd.org/getentropy.2
  */
 /*
- * -lperfstat is needed for the psuedo entropy data
+ * -lperfstat is needed for the pseudo entropy data
  */
 
 #include <sys/mman.h>
diff --git a/empty.c b/empty.c
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/empty.c