Index: /trunk/BNC/CHANGELOG.md =================================================================== --- /trunk/BNC/CHANGELOG.md (revision 11125) +++ /trunk/BNC/CHANGELOG.md (revision 11126) @@ -54,4 +54,8 @@ - FIXED: Memory corruption by stream content: VTEC messages with spherical harmonics degree or order 16 (IGS-SSR and RTCM-SSR; with 4 layers BNC crashed), RTCM-SSR metadata with more than 7 entries, names of 31 characters in RTCM 1300/1301/1302; range check of the VTEC parameters from the RTNet engine - FIXED: Password no longer sent in the request line (Ntrip Version 1 via proxy, RTSP) and no longer written to the log (RTSP) +- FIXED: Upload of CRS messages 1300/1302 (and encoding of 1301): names were sent padded to 31 characters, database links without their length field (unreadable for decoders); no CRS messages for a custom transformation +- FIXED: Upload via Ntrip 2s: 'Ignore SSL authorization errors' had no effect (handshake failed), and with it ticked no client certificate was presented; SSL errors are logged with their reason; for upload and download the ignored errors are logged; without OpenSSL run-time libraries no upload instead of an unencrypted Ntrip Version 2 upload +- FIXED: Encoding of new RTCM-SSR metadata with more than 30 additional parameter bits +- CHANGED: Help text of 'Ignore SSL authorization errors' explains that the server is then not authenticated ## 2.13.7 (2026-07-31) Index: /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm_new.cpp =================================================================== --- /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm_new.cpp (revision 11125) +++ /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm_new.cpp (revision 11126) @@ -472,5 +472,5 @@ for (i = 0; i < md->NumEntries; i++) { E_MODEL_CORRECTION_TYPE_INDICATOR(md->Entries[i].TypeIndicator) - E_ADDITIONAL_MODEL_PARAMETER_INDICATOR(md->Entries[i].ApplicationIndicator) + E_MODEL_CORRECTION_APPLICATION_INDICATOR(md->Entries[i].ApplicationIndicator) E_NON_DEFAULT_MODEL_CORRECTION_INDICATOR(md->Entries[i].nonDefaultIndicator) if (md->Entries[i].nonDefaultIndicator) { @@ -489,5 +489,12 @@ if (md->Entries[i].nonDefaultIndicator && md->Entries[i].additionalParameterIndicator) { - E_ADDITIONAL_MODEL_PARAMETER_DATA(md->Entries[i].additionalParameterData, md->Entries[i].additionalParameterNumBits) + /* up to 255 bits, only 32 stored (leading bits zero); in pieces of + 16 bits, as ADDBITS cannot handle more than 30 bits */ + unsigned int k = md->Entries[i].additionalParameterNumBits; + while (k) { + unsigned int n = (k > 16) ? 16 : k; + k -= n; + E_ADDITIONAL_MODEL_PARAMETER_DATA((k < 32) ? (md->Entries[i].additionalParameterData >> k) : 0, n) + } } } Index: /trunk/BNC/src/RTCM3/crsEncoder.cpp =================================================================== --- /trunk/BNC/src/RTCM3/crsEncoder.cpp (revision 11125) +++ /trunk/BNC/src/RTCM3/crsEncoder.cpp (revision 11126) @@ -11,4 +11,12 @@ using namespace std; +// Length of a name for the 5-bit length field: up to the terminating 0, +// at most 31 characters +//////////////////////////////////////////////////////////////////////////// +static int nameLength(const char* name, size_t bufSize) { + size_t n = strnlen(name, bufSize); + return (n > 31) ? 31 : int(n); +} + // build up RTCM3 for serviceCrs //////////////////////////////////////////////////////////////////////////// @@ -17,6 +25,5 @@ INITBLOCK ADDBITS(12, 1300) - int N = sizeof(serviceCrs._name) / sizeof(serviceCrs._name[0]); - if (N > 31) {N = 31;} + int N = nameLength(serviceCrs._name, sizeof(serviceCrs._name)); ADDBITS(5, N) for(int i = 0; i < N; i++) { @@ -35,6 +42,5 @@ ADDBITS(12, 1302) - int N = sizeof(rtcmCrs._name) / sizeof(rtcmCrs._name[0]); - if (N > 31) {N = 31;} + int N = nameLength(rtcmCrs._name, sizeof(rtcmCrs._name)); ADDBITS(5, N) for(int i = 0; i < N; i++) { @@ -44,11 +50,12 @@ ADDBITS(5, rtcmCrs._plateNumber) int dblinknum = rtcmCrs._databaseLinks.size(); + if (dblinknum > 7) {dblinknum = 7;} // 3 bits ADDBITS(3, dblinknum); - if (dblinknum) { - for(int d = 0; d < dblinknum; d++) { - N = sizeof(rtcmCrs._databaseLinks[d]) / sizeof(rtcmCrs._databaseLinks[d][0]); - for(int i = 0; i < N; i++) { - ADDBITS(8, rtcmCrs._databaseLinks[d].toLatin1()[i]) - } + for(int d = 0; d < dblinknum; d++) { + QByteArray dblink = rtcmCrs._databaseLinks[d].toLatin1(); + N = nameLength(dblink.constData(), dblink.size()); + ADDBITS(5, N) + for(int i = 0; i < N; i++) { + ADDBITS(8, dblink[i]) } } @@ -65,12 +72,10 @@ ADDBITS(12, 1301) - int N = sizeof(helmertPar._sourceName) / sizeof(helmertPar._sourceName[0]); - if (N > 31) {N = 31;} + int N = nameLength(helmertPar._sourceName, sizeof(helmertPar._sourceName)); ADDBITS(5, N) for(int i = 0; i < N; i++) { ADDBITS(8, helmertPar._sourceName[i]) } - N = sizeof(helmertPar._targetName) / sizeof(helmertPar._targetName[0]); - if (N > 31) {N = 31;} + N = nameLength(helmertPar._targetName, sizeof(helmertPar._targetName)); ADDBITS(5, N) for(int i = 0; i < N; i++) { Index: /trunk/BNC/src/bnchelp.html =================================================================== --- /trunk/BNC/src/bnchelp.html (revision 11125) +++ /trunk/BNC/src/bnchelp.html (revision 11126) @@ -2684,5 +2684,9 @@ Broadcaster.

- Tick 'Ignore SSL authorization errors' if you generally trust the server and do not want to be bothered with this. + Tick 'Ignore SSL authorization errors' to accept a server certificate that cannot be verified, e.g. a + self-signed certificate or one issued for another host name. The connection is then still encrypted, but the + server is not authenticated: anybody able to intercept the connection may receive your user name and password + and feed in manipulated data. The ignored errors are logged. Better save the CA certificate of the Ntrip + Broadcaster in the 'Path to SSL certificates' directory.

Index: /trunk/BNC/src/bncnetqueryv2.cpp =================================================================== --- /trunk/BNC/src/bncnetqueryv2.cpp (revision 11125) +++ /trunk/BNC/src/bncnetqueryv2.cpp (revision 11126) @@ -286,9 +286,13 @@ const QSslError& err = it.next(); msg += err.errorString(); - } - + if (it.hasNext()) { + msg += "; "; + } + } + + msg = _url.host() + ": " + msg; if (_sslIgnoreErrors) { _reply->ignoreSslErrors(); - BNC_CORE->slotMessage("BNC ignores SSL errors as configured", true); + BNC_CORE->slotMessage((msg + " (ignored as configured)").toLatin1(), true); } else { Index: /trunk/BNC/src/bncwindow.cpp =================================================================== --- /trunk/BNC/src/bncwindow.cpp (revision 11125) +++ /trunk/BNC/src/bncwindow.cpp (revision 11126) @@ -1548,5 +1548,5 @@ _sslCaCertPathLineEdit->setWhatsThis(tr("

Communication with an Ntrip Broadcaster over SSL requires the exchange of server certificates. Specify the path to a directory where you save CA certificates on your system.

BNC creates from *.crt and *.pem files a CA certificate database, which is used by the socket during the handshake phase to validate the peer's certificate.

Note that SSL communication is usually done over port 443. [key: sslCaCertPath]

")); _sslClientCertPathLineEdit->setWhatsThis(tr("

Two-sided communication with an Ntrip Broadcaster over SSL requires in addition the exchange of client certificates. Specify the full path to the client certificates on your system.

The file naming convention for client certificates in BNC is as follows: <hostname>.<port>.crt for the certificate and <hostname>.<port>.key for the private key, where <hostname> is without https://.

If available, the client or personal authentication certificate is presented to the peer during the SSL handshake process. Password protected key files are not supported.

Don't try communication via two sided SSL if you are not sure whether this is supported by the involved Ntrip Broadcaster.

Note that SSL communication is usually done over port 443. [key: sslClientCertPath]

")); - _sslIgnoreErrorsCheckBox->setWhatsThis(tr("

SSL communication may involve queries coming from the Ntrip Broadcaster. Tick 'Ignore SSL authorization errors' if you don't want to be bothered with this. [key: sslIgnoreErrors]

")); + _sslIgnoreErrorsCheckBox->setWhatsThis(tr("

Tick 'Ignore SSL authorization errors' to accept a server certificate that cannot be verified, e.g. a self-signed certificate or one issued for another host name. The connection is then still encrypted, but the server is not authenticated: anybody able to intercept the connection may receive your user name and password and feed in manipulated data. The ignored errors are logged. Better save the CA certificate of the Ntrip Broadcaster in the 'Path to SSL certificates' directory. [key: sslIgnoreErrors]

")); // WhatsThis, General Index: /trunk/BNC/src/upload/bncrtnetuploadcaster.cpp =================================================================== --- /trunk/BNC/src/upload/bncrtnetuploadcaster.cpp (revision 11125) +++ /trunk/BNC/src/upload/bncrtnetuploadcaster.cpp (revision 11126) @@ -1068,5 +1068,5 @@ // ----------- QByteArray hlpBufferServiceCrs; - if (sizeof(serviceCrs._name) > 0) { + if (serviceCrs._name[0]) { // no CRS messages for a custom transformation if (fmod(epoTime.gpssec(), _samplRtcmCrs) == 0.0) { memset(obuffer, 0, sizeof(obuffer)); @@ -1081,5 +1081,5 @@ // -------- QByteArray hlpBufferRtcmCrs; - if (sizeof(rtcmCrs._name) > 0) { + if (rtcmCrs._name[0]) { if (fmod(epoTime.gpssec(), _samplRtcmCrs) == 0.0) { memset(obuffer, 0, sizeof(obuffer)); Index: /trunk/BNC/src/upload/bncuploadcaster.cpp =================================================================== --- /trunk/BNC/src/upload/bncuploadcaster.cpp (revision 11125) +++ /trunk/BNC/src/upload/bncuploadcaster.cpp (revision 11126) @@ -80,8 +80,8 @@ if (_ntripVersion == "2s") { if (!QSslSocket::supportsSsl()) { - emit(newMessage( - "For SSL support please install OpenSSL run-time libraries: Ntrip Version 2 is tried", - true)); - _ntripVersion == "2"; + // no fallback to Ntrip Version 2: user name and password would be sent + // unencrypted although an encrypted connection was configured + emit(newMessage(_mountpoint.toLatin1() + "@" + _casterOutHost.toLatin1() + + ": No SSL support, please install OpenSSL run-time libraries: no upload", true)); } else { _secure = true; @@ -150,6 +150,13 @@ const QSslError& err = it.next(); msg += err.errorString(); - } - emit(newMessage(msg.toLatin1(), true)); + if (it.hasNext()) { + msg += "; "; + } + } + if (_sslIgnoreErrors) { + _outSocket->ignoreSslErrors(); + msg += " (ignored as configured)"; + } + emit(newMessage(_mountpoint.toLatin1() + "@" + _casterOutHost.toLatin1() + ": " + msg.toLatin1(), true)); } } @@ -203,4 +210,8 @@ } + if (_ntripVersion == "2s" && !_secure) { // no SSL support, see constructor + return; + } + if (_outSocket != 0 && _outSocket->state() == QAbstractSocket::ConnectedState) { @@ -224,23 +235,23 @@ _outSocket->setProxy(QNetworkProxy::NoProxy); - if (_sslIgnoreErrors) { - _outSocket->ignoreSslErrors(); - } else { - bncSslConfig sslConfig = BNC_SSL_CONFIG; - QFile clientCrtFile(_crtFileName); - QFile privateKeyFile(_keyFileName); - if ( clientCrtFile.exists() && privateKeyFile.exists()) { - // set local certificate - clientCrtFile.open(QIODevice::ReadOnly); - QSslCertificate clientCrt(&clientCrtFile); - sslConfig.setLocalCertificate(clientCrt); - // set private key if available - privateKeyFile.open(QIODevice::ReadOnly); - QSslKey privateKey(&privateKeyFile, QSsl::Rsa); - sslConfig.setPrivateKey(privateKey); - } - _outSocket->setSslConfiguration(sslConfig); - connect(_outSocket, SIGNAL(sslErrors(QList)), this, SLOT(slotSslErrors(QList))); - } + bncSslConfig sslConfig = BNC_SSL_CONFIG; + QFile clientCrtFile(_crtFileName); + QFile privateKeyFile(_keyFileName); + if ( clientCrtFile.exists() && privateKeyFile.exists()) { + // set local certificate + clientCrtFile.open(QIODevice::ReadOnly); + QSslCertificate clientCrt(&clientCrtFile); + sslConfig.setLocalCertificate(clientCrt); + // set private key if available + privateKeyFile.open(QIODevice::ReadOnly); + QSslKey privateKey(&privateKeyFile, QSsl::Rsa); + sslConfig.setPrivateKey(privateKey); + } + _outSocket->setSslConfiguration(sslConfig); + // Direct connection: the socket lives in this thread, the caster object in + // the main thread. The slot must run during the handshake, both for + // ignoreSslErrors() to take effect and to access _outSocket safely. + connect(_outSocket, SIGNAL(sslErrors(QList)), this, SLOT(slotSslErrors(QList)), + Qt::DirectConnection); if (!_proxy) {