|
| 1 | +From cd6b39d828b1ddd66fbad26fcd1cda783d2b045b Mon Sep 17 00:00:00 2001 |
| 2 | +From: Rudi Heitbaum <rudi@heitbaum.com> |
| 3 | +Date: Sat, 21 Mar 2026 14:35:50 +1100 |
| 4 | +Subject: [PATCH] Change parameter type of str function to const |
| 5 | + |
| 6 | +Allows build with OpenSSL4 |
| 7 | + |
| 8 | +../../include/cxxtools/char.h: In function 'bool cxxtools::operator==(const Char&, unsigned int)': |
| 9 | +../../include/cxxtools/char.h:134:32: warning: comparison of integer expressions of different signedness: 'cxxtools::Char::value_type' {aka 'int'} and 'unsigned int' [-Wsign-compare] |
| 10 | + 134 | { return a.value() == b; } |
| 11 | + | ~~~~~~~~~~^~~~ |
| 12 | +../../src/sslcertificateimpl.cpp: In member function 'cxxtools::String cxxtools::SslCertificateImpl::getSubject() const': |
| 13 | +../../src/sslcertificateimpl.cpp:169:37: error: invalid conversion from 'const X509_NAME*' {aka 'const X509_name_st*'} to 'X509_NAME*' {aka 'X509_name_st*'} [-fpermissive] |
| 14 | + 169 | return str(X509_get_subject_name(_cert)); |
| 15 | + | ~~~~~~~~~~~~~~~~~~~~~^~~~~~~ |
| 16 | + | | |
| 17 | + | const X509_NAME* {aka const X509_name_st*} |
| 18 | +../../src/sslcertificateimpl.cpp:40:30: note: initializing argument 1 of 'cxxtools::String cxxtools::str(X509_NAME*)' |
| 19 | + 40 | static String str(X509_NAME* a) |
| 20 | + | ~~~~~~~~~~~^ |
| 21 | +../../src/sslcertificateimpl.cpp: In member function 'cxxtools::String cxxtools::SslCertificateImpl::getIssuer() const': |
| 22 | +../../src/sslcertificateimpl.cpp:174:36: error: invalid conversion from 'const X509_NAME*' {aka 'const X509_name_st*'} to 'X509_NAME*' {aka 'X509_name_st*'} [-fpermissive] |
| 23 | + 174 | return str(X509_get_issuer_name(_cert)); |
| 24 | + | ~~~~~~~~~~~~~~~~~~~~^~~~~~~ |
| 25 | + | | |
| 26 | + | const X509_NAME* {aka const X509_name_st*} |
| 27 | +../../src/sslcertificateimpl.cpp:40:30: note: initializing argument 1 of 'cxxtools::String cxxtools::str(X509_NAME*)' |
| 28 | + 40 | static String str(X509_NAME* a) |
| 29 | + | ~~~~~~~~~~~^ |
| 30 | +--- |
| 31 | + src/sslcertificateimpl.cpp | 2 +- |
| 32 | + 1 file changed, 1 insertion(+), 1 deletion(-) |
| 33 | + |
| 34 | +diff --git a/src/sslcertificateimpl.cpp b/src/sslcertificateimpl.cpp |
| 35 | +index bd079fe9..de9a403a 100644 |
| 36 | +--- a/src/sslcertificateimpl.cpp |
| 37 | ++++ b/src/sslcertificateimpl.cpp |
| 38 | +@@ -37,7 +37,7 @@ |
| 39 | + |
| 40 | + namespace cxxtools |
| 41 | + { |
| 42 | +-static String str(X509_NAME* a) |
| 43 | ++static String str(const X509_NAME* a) |
| 44 | + { |
| 45 | + class MemBIO |
| 46 | + { |
0 commit comments