Fredrik Fornwall
5 years ago
3 changed files with 0 additions and 100 deletions
@ -1,13 +0,0 @@ |
|||||
diff -u -r ../httping-2.5/mssl.c ./mssl.c
|
|
||||
--- ../httping-2.5/mssl.c 2016-09-12 07:45:50.000000000 +0000
|
|
||||
+++ ./mssl.c 2018-08-23 19:38:43.467717597 +0000
|
|
||||
@@ -35,7 +35,9 @@
|
|
||||
ERR_free_strings(); |
|
||||
|
|
||||
ERR_remove_state(0); |
|
||||
+#ifndef OPENSSL_NO_ENGINE
|
|
||||
ENGINE_cleanup(); |
|
||||
+#endif
|
|
||||
CONF_modules_free(); |
|
||||
EVP_cleanup(); |
|
||||
CRYPTO_cleanup_all_ex_data(); |
|
@ -1,12 +0,0 @@ |
|||||
diff -u -r ../ldns-1.7.0/keys.c ./keys.c
|
|
||||
--- ../ldns-1.7.0/keys.c 2016-12-20 10:48:22.000000000 +0000
|
|
||||
+++ ./keys.c 2018-08-23 17:05:00.759800098 +0000
|
|
||||
@@ -107,7 +107,7 @@
|
|
||||
|
|
||||
k = ldns_key_new(); |
|
||||
if(!k) return LDNS_STATUS_MEM_ERR; |
|
||||
-#ifndef S_SPLINT_S
|
|
||||
+#if !defined(S_SPLINT_S) && !defined(OPENSSL_NO_ENGINE)
|
|
||||
k->_key.key = ENGINE_load_private_key(e, key_id, UI_OpenSSL(), NULL); |
|
||||
if(!k->_key.key) { |
|
||||
ldns_key_free(k); |
|
@ -1,75 +0,0 @@ |
|||||
diff -N -u -r ../socat-1.7.2.4/openpty.c ./openpty.c
|
|
||||
--- ../socat-1.7.2.4/openpty.c 1970-01-01 01:00:00.000000000 +0100
|
|
||||
+++ ./openpty.c 2014-07-15 15:23:08.731170078 +0200
|
|
||||
@@ -0,0 +1,71 @@
|
|
||||
+/* Copyright (C) 1998, 1999, 2004 Free Software Foundation, Inc.
|
|
||||
+ This file is part of the GNU C Library.
|
|
||||
+ Contributed by Zack Weinberg <zack@rabi.phys.columbia.edu>, 1998.
|
|
||||
+
|
|
||||
+ The GNU C Library is free software; you can redistribute it and/or
|
|
||||
+ modify it under the terms of the GNU Lesser General Public
|
|
||||
+ License as published by the Free Software Foundation; either
|
|
||||
+ version 2.1 of the License, or (at your option) any later version.
|
|
||||
+
|
|
||||
+ The GNU C Library is distributed in the hope that it will be useful,
|
|
||||
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||
+ Lesser General Public License for more details.
|
|
||||
+
|
|
||||
+ You should have received a copy of the GNU Lesser General Public
|
|
||||
+ License along with the GNU C Library; if not, write to the Free
|
|
||||
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
||||
+ 02111-1307 USA. */
|
|
||||
+
|
|
||||
+#include <errno.h>
|
|
||||
+#include <fcntl.h>
|
|
||||
+#include <limits.h>
|
|
||||
+#include <stdlib.h>
|
|
||||
+#include <string.h>
|
|
||||
+#include <termios.h>
|
|
||||
+#include <unistd.h>
|
|
||||
+#include <sys/types.h>
|
|
||||
+#include <sys/ioctl.h>
|
|
||||
+
|
|
||||
+#define _PATH_DEVPTMX "/dev/ptmx"
|
|
||||
+
|
|
||||
+int openpty (int *amaster, int *aslave, char *name, struct termios *termp,
|
|
||||
+ struct winsize *winp)
|
|
||||
+{
|
|
||||
+ char buf[PATH_MAX];
|
|
||||
+ int master, slave;
|
|
||||
+
|
|
||||
+ master = open(_PATH_DEVPTMX, O_RDWR);
|
|
||||
+ if (master == -1)
|
|
||||
+ return -1;
|
|
||||
+
|
|
||||
+ if (grantpt(master))
|
|
||||
+ goto fail;
|
|
||||
+
|
|
||||
+ if (unlockpt(master))
|
|
||||
+ goto fail;
|
|
||||
+
|
|
||||
+ if (ptsname_r(master, buf, sizeof buf))
|
|
||||
+ goto fail;
|
|
||||
+
|
|
||||
+ slave = open(buf, O_RDWR | O_NOCTTY);
|
|
||||
+ if (slave == -1)
|
|
||||
+ goto fail;
|
|
||||
+
|
|
||||
+ /* XXX Should we ignore errors here? */
|
|
||||
+ if (termp)
|
|
||||
+ tcsetattr(slave, TCSAFLUSH, termp);
|
|
||||
+ if (winp)
|
|
||||
+ ioctl(slave, TIOCSWINSZ, winp);
|
|
||||
+
|
|
||||
+ *amaster = master;
|
|
||||
+ *aslave = slave;
|
|
||||
+ if (name != NULL)
|
|
||||
+ strcpy(name, buf);
|
|
||||
+
|
|
||||
+ return 0;
|
|
||||
+
|
|
||||
+fail:
|
|
||||
+ close(master);
|
|
||||
+ return -1;
|
|
||||
+}
|
|
Loading…
Reference in new issue