Skip to content

Commit 5ecfa36

Browse files
jonasschnellijonasschnelli
committed
Remove openssl info from init/log and from Qt debug window
1 parent 3174621 commit 5ecfa36

File tree

3 files changed

+35
-76
lines changed

3 files changed

+35
-76
lines changed

‎src/init.cpp‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1091,14 +1091,6 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
10911091
if (fPrintToDebugLog)
10921092
OpenDebugLog();
10931093

1094-
#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
1095-
LogPrintf("Using OpenSSL version %s\n", SSLeay_version(SSLEAY_VERSION));
1096-
#elif defined OPENSSL_VERSION
1097-
LogPrintf("Using OpenSSL version %s\n", OpenSSL_version(OPENSSL_VERSION));
1098-
#elif defined LIBRESSL_VERSION_TEXT
1099-
LogPrintf("Using %s\n", LIBRESSL_VERSION_TEXT);
1100-
#endif
1101-
11021094
#ifdef ENABLE_WALLET
11031095
LogPrintf("Using BerkeleyDB version %s\n", DbEnv::version(0, 0, 0));
11041096
#endif

‎src/qt/forms/debugwindow.ui‎

Lines changed: 35 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<x>0</x>
88
<y>0</y>
99
<width>740</width>
10-
<height>450</height>
10+
<height>430</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -113,32 +113,6 @@
113113
</widget>
114114
</item>
115115
<item row="4" column="0">
116-
<widget class="QLabel" name="label_14">
117-
<property name="text">
118-
<string>Using OpenSSL version</string>
119-
</property>
120-
<property name="indent">
121-
<number>10</number>
122-
</property>
123-
</widget>
124-
</item>
125-
<item row="4" column="1" colspan="2">
126-
<widget class="QLabel" name="openSSLVersion">
127-
<property name="cursor">
128-
<cursorShape>IBeamCursor</cursorShape>
129-
</property>
130-
<property name="text">
131-
<string>N/A</string>
132-
</property>
133-
<property name="textFormat">
134-
<enum>Qt::PlainText</enum>
135-
</property>
136-
<property name="textInteractionFlags">
137-
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
138-
</property>
139-
</widget>
140-
</item>
141-
<item row="5" column="0">
142116
<widget class="QLabel" name="label_berkeleyDBVersion">
143117
<property name="text">
144118
<string>Using BerkeleyDB version</string>
@@ -148,7 +122,7 @@
148122
</property>
149123
</widget>
150124
</item>
151-
<item row="5" column="1" colspan="2">
125+
<item row="4" column="1" colspan="2">
152126
<widget class="QLabel" name="berkeleyDBVersion">
153127
<property name="cursor">
154128
<cursorShape>IBeamCursor</cursorShape>
@@ -164,14 +138,14 @@
164138
</property>
165139
</widget>
166140
</item>
167-
<item row="6" column="0">
141+
<item row="5" column="0">
168142
<widget class="QLabel" name="label_12">
169143
<property name="text">
170144
<string>Build date</string>
171145
</property>
172146
</widget>
173147
</item>
174-
<item row="6" column="1" colspan="2">
148+
<item row="5" column="1" colspan="2">
175149
<widget class="QLabel" name="buildDate">
176150
<property name="cursor">
177151
<cursorShape>IBeamCursor</cursorShape>
@@ -187,14 +161,14 @@
187161
</property>
188162
</widget>
189163
</item>
190-
<item row="7" column="0">
164+
<item row="6" column="0">
191165
<widget class="QLabel" name="label_13">
192166
<property name="text">
193167
<string>Startup time</string>
194168
</property>
195169
</widget>
196170
</item>
197-
<item row="7" column="1" colspan="2">
171+
<item row="6" column="1" colspan="2">
198172
<widget class="QLabel" name="startupTime">
199173
<property name="cursor">
200174
<cursorShape>IBeamCursor</cursorShape>
@@ -210,14 +184,27 @@
210184
</property>
211185
</widget>
212186
</item>
213-
<item row="9" column="0">
187+
<item row="7" column="0">
188+
<widget class="QLabel" name="labelNetwork">
189+
<property name="font">
190+
<font>
191+
<weight>75</weight>
192+
<bold>true</bold>
193+
</font>
194+
</property>
195+
<property name="text">
196+
<string>Network</string>
197+
</property>
198+
</widget>
199+
</item>
200+
<item row="8" column="0">
214201
<widget class="QLabel" name="label_8">
215202
<property name="text">
216203
<string>Name</string>
217204
</property>
218205
</widget>
219206
</item>
220-
<item row="9" column="1" colspan="2">
207+
<item row="8" column="1" colspan="2">
221208
<widget class="QLabel" name="networkName">
222209
<property name="cursor">
223210
<cursorShape>IBeamCursor</cursorShape>
@@ -233,14 +220,14 @@
233220
</property>
234221
</widget>
235222
</item>
236-
<item row="10" column="0">
223+
<item row="9" column="0">
237224
<widget class="QLabel" name="label_7">
238225
<property name="text">
239226
<string>Number of connections</string>
240227
</property>
241228
</widget>
242229
</item>
243-
<item row="10" column="1" colspan="2">
230+
<item row="9" column="1" colspan="2">
244231
<widget class="QLabel" name="numberOfConnections">
245232
<property name="cursor">
246233
<cursorShape>IBeamCursor</cursorShape>
@@ -256,7 +243,7 @@
256243
</property>
257244
</widget>
258245
</item>
259-
<item row="11" column="0">
246+
<item row="10" column="0">
260247
<widget class="QLabel" name="label_10">
261248
<property name="font">
262249
<font>
@@ -269,14 +256,14 @@
269256
</property>
270257
</widget>
271258
</item>
272-
<item row="12" column="0">
259+
<item row="11" column="0">
273260
<widget class="QLabel" name="label_3">
274261
<property name="text">
275262
<string>Current number of blocks</string>
276263
</property>
277264
</widget>
278265
</item>
279-
<item row="12" column="1" colspan="2">
266+
<item row="11" column="1" colspan="2">
280267
<widget class="QLabel" name="numberOfBlocks">
281268
<property name="cursor">
282269
<cursorShape>IBeamCursor</cursorShape>
@@ -292,14 +279,14 @@
292279
</property>
293280
</widget>
294281
</item>
295-
<item row="13" column="0">
282+
<item row="12" column="0">
296283
<widget class="QLabel" name="labelLastBlockTime">
297284
<property name="text">
298285
<string>Last block time</string>
299286
</property>
300287
</widget>
301288
</item>
302-
<item row="13" column="1" colspan="2">
289+
<item row="12" column="1" colspan="2">
303290
<widget class="QLabel" name="lastBlockTime">
304291
<property name="cursor">
305292
<cursorShape>IBeamCursor</cursorShape>
@@ -315,7 +302,7 @@
315302
</property>
316303
</widget>
317304
</item>
318-
<item row="14" column="0">
305+
<item row="13" column="0">
319306
<widget class="QLabel" name="labelMempoolTitle">
320307
<property name="font">
321308
<font>
@@ -328,14 +315,14 @@
328315
</property>
329316
</widget>
330317
</item>
331-
<item row="15" column="0">
318+
<item row="14" column="0">
332319
<widget class="QLabel" name="labelNumberOfTransactions">
333320
<property name="text">
334321
<string>Current number of transactions</string>
335322
</property>
336323
</widget>
337324
</item>
338-
<item row="15" column="1">
325+
<item row="14" column="1">
339326
<widget class="QLabel" name="mempoolNumberTxs">
340327
<property name="cursor">
341328
<cursorShape>IBeamCursor</cursorShape>
@@ -351,27 +338,14 @@
351338
</property>
352339
</widget>
353340
</item>
354-
<item row="8" column="0">
355-
<widget class="QLabel" name="labelNetwork">
356-
<property name="font">
357-
<font>
358-
<weight>75</weight>
359-
<bold>true</bold>
360-
</font>
361-
</property>
362-
<property name="text">
363-
<string>Network</string>
364-
</property>
365-
</widget>
366-
</item>
367-
<item row="16" column="0">
341+
<item row="15" column="0">
368342
<widget class="QLabel" name="labelMemoryUsage">
369343
<property name="text">
370344
<string>Memory usage</string>
371345
</property>
372346
</widget>
373347
</item>
374-
<item row="16" column="1">
348+
<item row="15" column="1">
375349
<widget class="QLabel" name="mempoolSize">
376350
<property name="cursor">
377351
<cursorShape>IBeamCursor</cursorShape>
@@ -387,7 +361,7 @@
387361
</property>
388362
</widget>
389363
</item>
390-
<item row="14" column="2" rowspan="3">
364+
<item row="13" column="2" rowspan="3">
391365
<layout class="QVBoxLayout" name="verticalLayoutDebugButton">
392366
<property name="spacing">
393367
<number>3</number>
@@ -427,7 +401,7 @@
427401
</item>
428402
</layout>
429403
</item>
430-
<item row="18" column="0">
404+
<item row="16" column="0">
431405
<spacer name="verticalSpacer">
432406
<property name="orientation">
433407
<enum>Qt::Vertical</enum>

‎src/qt/rpcconsole.cpp‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -275,13 +275,6 @@ RPCConsole::RPCConsole(const PlatformStyle *platformStyle, QWidget *parent) :
275275
connect(ui->btnClearTrafficGraph, SIGNAL(clicked()), ui->trafficGraph, SLOT(clear()));
276276

277277
// set library version labels
278-
279-
#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
280-
ui->openSSLVersion->setText(SSLeay_version(SSLEAY_VERSION));
281-
#else
282-
ui->openSSLVersion->setText(OpenSSL_version(OPENSSL_VERSION));
283-
#endif
284-
285278
#ifdef ENABLE_WALLET
286279
ui->berkeleyDBVersion->setText(DbEnv::version(0, 0, 0));
287280
#else

0 commit comments

Comments
 (0)