Merge remote-tracking branch 'public/master'

# Conflicts:
#	README.md
#	src/main/java/de/rub/nds/tlsscanner/report/SiteReport.java
#	src/main/java/de/rub/nds/tlsscanner/report/SiteReportPrinter.java

Author: ic0ns

src/main/java/de/rub/nds/tlsscanner/Main.java

@@ -13,6 +13,7 @@
 import de.rub.nds.tlsattacker.core.config.delegate.GeneralDelegate;
 import de.rub.nds.tlsattacker.core.exceptions.ConfigurationException;
 import de.rub.nds.tlsscanner.config.ScannerConfig;
+import de.rub.nds.tlsscanner.constants.AnsiColors;
 import de.rub.nds.tlsscanner.constants.AnsiEscapeSequence;
 import de.rub.nds.tlsscanner.report.SiteReport;
 import java.io.IOException;
@@ -47,11 +48,11 @@ public static void main(String[] args) throws IOException {
                 LOGGER.info("Performing Scan, this may take some time...");
                 SiteReport report = scanner.scan();
                 LOGGER.info("Scanned in:" + ((System.currentTimeMillis() - time) / 1000) + "s\n");
-                if (!config.getGeneralDelegate().isDebug()) {
+                if (!config.getGeneralDelegate().isDebug() && !config.isNoProgressbar()) {
                     // ANSI escape sequences to erase the progressbar
                     ConsoleLogger.CONSOLE.info(AnsiEscapeSequence.ANSI_ONE_LINE_UP + AnsiEscapeSequence.ANSI_ERASE_LINE);
                 }
-                ConsoleLogger.CONSOLE.info("Scanned in: " + ((System.currentTimeMillis() - time) / 1000) + "s\n" + report.getFullReport(config.getReportDetail()));
+                ConsoleLogger.CONSOLE.info(AnsiColors.ANSI_RESET + "Scanned in: " + ((System.currentTimeMillis() - time) / 1000) + "s\n" + report.getFullReport(config.getReportDetail()));
             } catch (ConfigurationException E) {
                 LOGGER.error("Encountered a ConfigurationException aborting.", E);
             }

src/main/java/de/rub/nds/tlsscanner/probe/certificate/CertificateReportGenerator.java

@@ -96,7 +96,7 @@ private static void setCommonNames(CertificateReport report,
         if (x500name != null) {
             RDN[] rdNs = x500name.getRDNs(BCStyle.CN);
             for (int i = 0; i < rdNs.length; i++) {
-                commonNames.append(IETFUtils.valueToString(rdNs[i]));
+                commonNames.append(IETFUtils.valueToString(rdNs[i].getFirst().getValue()));
                 if (i < rdNs.length - 1) {
                     commonNames.append(" ,");
                 }

src/main/java/de/rub/nds/tlsscanner/report/SiteReportPrinter.java

@@ -1055,15 +1055,15 @@ private StringBuilder prettyAppendHeading(StringBuilder builder, String value) {
     }
 
     private StringBuilder prettyAppendUnderlined(StringBuilder builder, String name, String value) {
-        return builder.append(addIndentations(name)).append(": ").append(AnsiColors.ANSI_UNDERLINE + value + AnsiColors.ANSI_RESET).append("\n");
+        return builder.append(addIndentations(name)).append(": ").append((report.isNoColor() == false ? AnsiColors.ANSI_UNDERLINE + value + AnsiColors.ANSI_RESET : value)).append("\n");
     }
 
     private StringBuilder prettyAppendUnderlined(StringBuilder builder, String name, boolean value) {
-        return builder.append(addIndentations(name)).append(": ").append(AnsiColors.ANSI_UNDERLINE + value + AnsiColors.ANSI_RESET).append("\n");
+        return builder.append(addIndentations(name)).append(": ").append((report.isNoColor() == false ? AnsiColors.ANSI_UNDERLINE + value + AnsiColors.ANSI_RESET : value)).append("\n");
     }
 
     private StringBuilder prettyAppendUnderlined(StringBuilder builder, String name, long value) {
-        return builder.append(addIndentations(name)).append(": ").append(AnsiColors.ANSI_UNDERLINE + value + AnsiColors.ANSI_RESET).append("\n");
+        return builder.append(addIndentations(name)).append(": ").append((report.isNoColor() == false ? AnsiColors.ANSI_UNDERLINE + value + AnsiColors.ANSI_RESET : value)).append("\n");
     }
 
     private StringBuilder prettyAppendSubheading(StringBuilder builder, String name) {