Use hardening option to add only hardening flags

[tinc] / src / gcrypt / pem.c

diff --git a/src/gcrypt/pem.c b/src/gcrypt/pem.c
index b22d0e4..56858f2 100644 (file)
--- a/src/gcrypt/pem.c
+++ b/src/gcrypt/pem.c
@@ -1,5 +1,26 @@
+/*
+    pem.c -- PEM encoding and decoding
+    Copyright (C) 2007-2022 Guus Sliepen <guus@tinc-vpn.org>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "../system.h"
+
 #include "pem.h"
-#include "utils.h"
+#include "../utils.h"
 
 // Base64 decoding table
 
@@ -35,7 +56,7 @@ static const char b64enc[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
 // Heavily based on code by Jouni Malinen <j@w1.fi>
 // https://web.mit.edu/freebsd/head/contrib/wpa/src/utils/base64.c
 static size_t b64encode(char *dst, const void *src, const size_t length) {
-       const uint8_t *end = src + length;
+       const uint8_t *end = (const uint8_t *)src + length;
        const uint8_t *in = src;
        char *pos = dst;
 
@@ -72,11 +93,11 @@ bool pem_encode(FILE *fp, const char *header, uint8_t *buf, size_t size) {
                return false;
        }
 
-       char b64[B64_SIZE(size)];
+       char *b64 = alloca(B64_SIZE(size));
        const size_t b64len = b64encode(b64, buf, size);
 
-       for(char *p = b64; p < b64 + b64len; p += 64) {
-               if(fprintf(fp, "%.64s\n", p) <= 0) {
+       for(size_t i = 0; i < b64len; i += 64) {
+               if(fprintf(fp, "%.64s\n", &b64[i]) <= 0) {
                        return false;
                }
        }