sync code with last fixes and improvements from OpenBSD

This commit is contained in:
purplerain 2023-06-12 03:32:40 +00:00
parent bf0676207f
commit 8f31919cdb
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
325 changed files with 2094 additions and 51856 deletions

View file

@ -1,4 +1,4 @@
/* $OpenBSD: openssl.c,v 1.33 2023/04/25 16:11:02 tb Exp $ */
/* $OpenBSD: openssl.c,v 1.35 2023/06/11 13:02:10 jsg Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -329,10 +329,6 @@ FUNCTION functions[] = {
{ FUNC_TYPE_CIPHER, "sm4-ofb", enc_main },
{ FUNC_TYPE_CIPHER, "sm4-cfb", enc_main },
#endif
#ifdef ZLIB
{ FUNC_TYPE_CIPHER, "zlib", enc_main },
#endif
{ 0, NULL, NULL }
};
@ -382,16 +378,12 @@ openssl_shutdown(void)
int
main(int argc, char **argv)
{
ARGS arg;
char *to_free = NULL;
int i, ret = 0;
char *p;
LHASH_OF(FUNCTION) * prog = NULL;
long errline;
arg.data = NULL;
arg.count = 0;
if (pledge("stdio cpath wpath rpath inet dns proc flock tty", NULL) == -1) {
fprintf(stderr, "openssl: pledge: %s\n", strerror(errno));
exit(1);
@ -471,7 +463,6 @@ main(int argc, char **argv)
}
if (prog != NULL)
lh_FUNCTION_free(prog);
free(arg.data);
openssl_shutdown();