izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Yukino Song
2024-10-30 22:08:40 +08:00
parent 4fad7dcded ca40cfd268
commit 46bd39623f
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/crypto.cpp
View File

@@ -4,6 +4,7 @@
*/ */
#include "crypto.h" #include "crypto.h"
#include <openssl/pem.h> #include <openssl/pem.h>
#include <openssl/rsa.h>
namespace crypto { namespace crypto {
using asn1_string_t = util::safe_ptr<ASN1_STRING, ASN1_STRING_free>; using asn1_string_t = util::safe_ptr<ASN1_STRING, ASN1_STRING_free>;

8
src/nvhttp.cpp
View File

@@ -1369,7 +1369,13 @@ namespace nvhttp {
// Verify certificates after establishing connection // Verify certificates after establishing connection
https_server.verify = [](req_https_t req, SSL *ssl) { https_server.verify = [](req_https_t req, SSL *ssl) {
crypto::x509_t x509 { SSL_get_peer_certificate(ssl) }; crypto::x509_t x509 {
#if OPENSSL_VERSION_MAJOR >= 3
SSL_get1_peer_certificate(ssl)
#else
SSL_get_peer_certificate(ssl)
#endif
};
if (!x509) { if (!x509) {
BOOST_LOG(info) << "unknown -- denied"sv; BOOST_LOG(info) << "unknown -- denied"sv;
return false; return false;

1
src/video.cpp
View File

@@ -514,6 +514,7 @@ namespace video {
{ "forced-idr"s, 1 }, { "forced-idr"s, 1 },
{ "zerolatency"s, 1 }, { "zerolatency"s, 1 },
{ "surfaces"s, 1 }, { "surfaces"s, 1 },
{ "filler_data"s, false },
{ "preset"s, &config::video.nv_legacy.preset }, { "preset"s, &config::video.nv_legacy.preset },
{ "tune"s, NV_ENC_TUNING_INFO_ULTRA_LOW_LATENCY }, { "tune"s, NV_ENC_TUNING_INFO_ULTRA_LOW_LATENCY },
{ "rc"s, NV_ENC_PARAMS_RC_CBR }, { "rc"s, NV_ENC_PARAMS_RC_CBR },