diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index 310211c7..e1c0b02b 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -1041,7 +1041,7 @@ multi_print_status(struct multi_context *m, struct status_output *so, const int #ifdef ENABLE_ASYNC_PUSH if (m->inotify_watchers) { - msg(D_MULTI_DEBUG, "inotify watchers count: %d\n", hash_n_elements(m->inotify_watchers)); + msg(D_MULTI_DEBUG, "inotify watchers count: %d", hash_n_elements(m->inotify_watchers)); } #endif } diff --git a/src/openvpn/plugin.c b/src/openvpn/plugin.c index 2ad459cd..d615201b 100644 --- a/src/openvpn/plugin.c +++ b/src/openvpn/plugin.c @@ -1036,7 +1036,7 @@ plugin_return_print(const int msglevel, const char *prefix, const struct plugin_ msg(msglevel, "PLUGIN #%d (%s)", i, prefix); while (l) { - msg(msglevel, "[%d] '%s' -> '%s'\n", + msg(msglevel, "[%d] '%s' -> '%s'", ++count, l->name, l->value); diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index 92e71a39..89d5f932 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -2530,7 +2530,7 @@ open_tun(const char *dev, const char *dev_type, const char *dev_node, struct tun { if (ioctl(if_fd, SIOCGLIFFLAGS, &ifr) < 0) { - msg(M_ERR, "Can't get flags\n"); + msg(M_ERR, "Can't get flags"); } strncpynt(ifr.lifr_name, tt->actual_name, sizeof(ifr.lifr_name)); ifr.lifr_ppa = ppa; @@ -2541,7 +2541,7 @@ open_tun(const char *dev, const char *dev_type, const char *dev_node, struct tun } if (ioctl(if_fd, SIOCGLIFFLAGS, &ifr) <0) { - msg(M_ERR, "Can't get flags\n"); + msg(M_ERR, "Can't get flags"); } /* Push arp module to if_fd */ if (ioctl(if_fd, I_PUSH, "arp") < 0) @@ -2560,18 +2560,18 @@ open_tun(const char *dev, const char *dev_type, const char *dev_node, struct tun /* Push arp module to ip_fd */ if (ioctl(tt->ip_fd, I_PUSH, "arp") < 0) { - msg(M_ERR, "Can't push ARP module\n"); + msg(M_ERR, "Can't push ARP module"); } /* Open arp_fd */ if ((arp_fd = open(arp_node, O_RDWR, 0)) < 0) { - msg(M_ERR, "Can't open %s\n", arp_node); + msg(M_ERR, "Can't open %s", arp_node); } /* Push arp module to arp_fd */ if (ioctl(arp_fd, I_PUSH, "arp") < 0) { - msg(M_ERR, "Can't push ARP module\n"); + msg(M_ERR, "Can't push ARP module"); } /* Set ifname to arp */ @@ -2581,7 +2581,7 @@ open_tun(const char *dev, const char *dev_type, const char *dev_node, struct tun strioc_if.ic_dp = (char *)𝔦 if (ioctl(arp_fd, I_STR, &strioc_if) < 0) { - msg(M_ERR, "Can't set ifname to arp\n"); + msg(M_ERR, "Can't set ifname to arp"); } } diff --git a/src/openvpn/xkey_helper.c b/src/openvpn/xkey_helper.c index c8033232..4c470f01 100644 --- a/src/openvpn/xkey_helper.c +++ b/src/openvpn/xkey_helper.c @@ -54,7 +54,7 @@ print_openssl_errors() unsigned long e; while ((e = ERR_get_error())) { - msg(M_WARN, "OpenSSL error %lu: %s\n", e, ERR_error_string(e, NULL)); + msg(M_WARN, "OpenSSL error %lu: %s", e, ERR_error_string(e, NULL)); } } @@ -431,7 +431,7 @@ ecdsa_bin2der(unsigned char *buf, int len, size_t capacity) if (derlen > (int) capacity) { ECDSA_SIG_free(ecsig); - msg(M_NONFATAL, "Error: DER encoded ECDSA signature is too long (%d)\n", derlen); + msg(M_NONFATAL, "Error: DER encoded ECDSA signature is too long (%d)", derlen); return 0; } derlen = i2d_ECDSA_SIG(ecsig, &buf); diff --git a/src/openvpn/xkey_provider.c b/src/openvpn/xkey_provider.c index f5fc9568..f69239dd 100644 --- a/src/openvpn/xkey_provider.c +++ b/src/openvpn/xkey_provider.c @@ -939,7 +939,7 @@ static int signature_sign(void *ctx, unsigned char *sig, size_t *siglen, size_t sigsize, const unsigned char *tbs, size_t tbslen) { - xkey_dmsg(D_XKEY, "entry with siglen = %zu\n", *siglen); + xkey_dmsg(D_XKEY, "entry with siglen = %zu", *siglen); XKEY_SIGNATURE_CTX *sctx = ctx; ASSERT(sctx); diff --git a/tests/unit_tests/openvpn/test_cryptoapi.c b/tests/unit_tests/openvpn/test_cryptoapi.c index ddbe2bc3..18e38d0f 100644 --- a/tests/unit_tests/openvpn/test_cryptoapi.c +++ b/tests/unit_tests/openvpn/test_cryptoapi.c @@ -65,7 +65,7 @@ crypto_print_openssl_errors(const unsigned int flags) unsigned long e; while ((e = ERR_get_error())) { - msg(flags, "OpenSSL error %lu: %s\n", e, ERR_error_string(e, NULL)); + msg(flags, "OpenSSL error %lu: %s", e, ERR_error_string(e, NULL)); } }