summaryrefslogtreecommitdiff
path: root/src/usr.bin/openssl/openssl.c
diff options
context:
space:
mode:
authortb <>2025-01-02 13:10:03 +0000
committertb <>2025-01-02 13:10:03 +0000
commit31683601b72b2a5980f5f5d968711f4a1fba7a52 (patch)
treec4838fa7396ce47a209dde85f2982a12ac8265be /src/usr.bin/openssl/openssl.c
parent6ea9ba6b09ff9e35104226f2e1b9e2540f4afa4e (diff)
downloadopenbsd-31683601b72b2a5980f5f5d968711f4a1fba7a52.tar.gz
openbsd-31683601b72b2a5980f5f5d968711f4a1fba7a52.tar.bz2
openbsd-31683601b72b2a5980f5f5d968711f4a1fba7a52.zip
Merge s_apps.h into apps.h
discussed with jsing
Diffstat (limited to 'src/usr.bin/openssl/openssl.c')
-rw-r--r--src/usr.bin/openssl/openssl.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/usr.bin/openssl/openssl.c b/src/usr.bin/openssl/openssl.c
index eaa5401ece..75a0e4d266 100644
--- a/src/usr.bin/openssl/openssl.c
+++ b/src/usr.bin/openssl/openssl.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: openssl.c,v 1.38 2025/01/02 12:31:44 tb Exp $ */ 1/* $OpenBSD: openssl.c,v 1.39 2025/01/02 13:10:03 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -127,8 +127,6 @@
127#include <openssl/ssl.h> 127#include <openssl/ssl.h>
128#include <openssl/x509.h> 128#include <openssl/x509.h>
129 129
130#include "s_apps.h"
131
132#define FUNC_TYPE_GENERAL 1 130#define FUNC_TYPE_GENERAL 1
133#define FUNC_TYPE_MD 2 131#define FUNC_TYPE_MD 2
134#define FUNC_TYPE_CIPHER 3 132#define FUNC_TYPE_CIPHER 3