SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2024-03-18 00:01:54 +00:00
parent 9adc065819
commit 710bf2c3ae
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
13 changed files with 149 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib/libcrypto/cversion.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: cversion.c,v 1.18 2023/07/08 08:28:23 beck Exp $ */
/* $OpenBSD: cversion.c,v 1.19 2024/03/16 21:42:20 tb Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -68,15 +68,15 @@ SSLeay_version(int t)
case SSLEAY_VERSION:
return OPENSSL_VERSION_TEXT;
case SSLEAY_BUILT_ON:
return("built on: date not available");
return "built on: date not available";
case SSLEAY_CFLAGS:
return("compiler: information not available");
return "compiler: information not available";
case SSLEAY_PLATFORM:
return("platform: information not available");
return "platform: information not available";
case SSLEAY_DIR:
return "OPENSSLDIR: \"" OPENSSLDIR "\"";
}
return("not available");
return "not available";
}
LCRYPTO_ALIAS(SSLeay_version);
@ -94,17 +94,17 @@ OpenSSL_version(int t)
case OPENSSL_VERSION:
return OPENSSL_VERSION_TEXT;
case OPENSSL_BUILT_ON:
return("built on: date not available");
return "built on: date not available";
case OPENSSL_CFLAGS:
return("compiler: information not available");
return "compiler: information not available";
case OPENSSL_PLATFORM:
return("platform: information not available");
return "platform: information not available";
case OPENSSL_DIR:
return "OPENSSLDIR: \"" OPENSSLDIR "\"";
case OPENSSL_ENGINES_DIR:
return "ENGINESDIR: N/A";
}
return("not available");
return "not available";
}
LCRYPTO_ALIAS(OpenSSL_version);

10
lib/libcrypto/rsa/rsa_ameth.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: rsa_ameth.c,v 1.57 2024/01/10 14:59:19 tb Exp $ */
/* $OpenBSD: rsa_ameth.c,v 1.58 2024/03/17 07:10:00 tb Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 2006.
*/
@ -605,6 +605,10 @@ rsa_md_to_algor(const EVP_MD *md, X509_ALGOR **out_alg)
if ((alg = X509_ALGOR_new()) == NULL)
goto err;
/*
* XXX - This omits the parameters, whereas RFC 4055, section 2.1
* explicitly states that an explicit ASN.1 NULL is required.
*/
if (!X509_ALGOR_set_evp_md(alg, md))
goto err;
@ -640,6 +644,10 @@ rsa_mgf1md_to_maskGenAlgorithm(const EVP_MD *mgf1md, X509_ALGOR **out_alg)
if ((inner_alg = X509_ALGOR_new()) == NULL)
goto err;
/*
* XXX - This omits the parameters, whereas RFC 4055, section 2.1
* explicitly states that an explicit ASN.1 NULL is required.
*/
if (!X509_ALGOR_set_evp_md(inner_alg, mgf1md))
goto err;
if ((astr = ASN1_item_pack(inner_alg, &X509_ALGOR_it, NULL)) == NULL)