refactor(c): compile all C as C++ code

Author: mbroadst

binding.gyp

@@ -2,16 +2,11 @@
   'targets': [
     {
       'target_name': 'kerberos',
-      "cflags": [
-        '-std=c++11',
-      ],
-      # 'cflags!': [ '-fno-exceptions', '-std=c++11' ],
-      # 'cflags_cc!': [ '-fno-exceptions' ],
       'include_dirs': [ '<!(node -e "require(\'nan\')")' ],
       'conditions': [
         ['OS=="mac" or OS=="linux"', {
           'sources': [
-            'src/base64.c',
+            'src/base64.cc',
             'src/kerberos.cc',
             'src/kerberos_client.cc',
             'src/kerberos_server.cc',

src/base64.c src/base64.cc

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2006-2008 Apple Inc. All rights reserved.
+ * Copyright (c) 2006-2018 Apple Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,55 +16,52 @@
 
 #include "base64.h"
 
-#include <errno.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-void die2(const char* message) {
-    if (errno) {
-        perror(message);
-    } else {
-        printf("ERROR: %s\n", message);
-    }
-
-    exit(1);
-}
-
 // base64 tables
-static char basis_64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-static signed char index_64[128] = {
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62,
-    -1, -1, -1, 63, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1, -1, 0,
-    1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
-    23, 24, 25, -1, -1, -1, -1, -1, -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
-    39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1};
-#define CHAR64(c) (((c) < 0 || (c) > 127) ? -1 : index_64[(c)])
+static char basis_64[] =
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+static signed char index_64[128] =
+{
+    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
+    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
+    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,62, -1,-1,-1,63,
+    52,53,54,55, 56,57,58,59, 60,61,-1,-1, -1,-1,-1,-1,
+    -1, 0, 1, 2,  3, 4, 5, 6,  7, 8, 9,10, 11,12,13,14,
+    15,16,17,18, 19,20,21,22, 23,24,25,-1, -1,-1,-1,-1,
+    -1,26,27,28, 29,30,31,32, 33,34,35,36, 37,38,39,40,
+    41,42,43,44, 45,46,47,48, 49,50,51,-1, -1,-1,-1,-1
+};
+#define CHAR64(c)  (((c) < 0 || (c) > 127) ? -1 : index_64[(c)])
 
 // base64_encode    :    base64 encode
 //
 // value            :    data to encode
 // vlen             :    length of data
 // (result)         :    new char[] - c-str of result
-char* base64_encode(const unsigned char* value, int vlen) {
-    char* result = (char*)malloc((vlen * 4) / 3 + 5);
+char *base64_encode(const unsigned char *value, size_t vlen)
+{
+    char *result = (char *)malloc((vlen * 4) / 3 + 5);
     if (result == NULL)
-        die2("Memory allocation failed");
-    char* out = result;
-    while (vlen >= 3) {
+    {
+        return NULL;
+    }
+    char *out = result;
+    while (vlen >= 3)
+    {
         *out++ = basis_64[value[0] >> 2];
         *out++ = basis_64[((value[0] << 4) & 0x30) | (value[1] >> 4)];
         *out++ = basis_64[((value[1] << 2) & 0x3C) | (value[2] >> 6)];
         *out++ = basis_64[value[2] & 0x3F];
         value += 3;
         vlen -= 3;
     }
-    if (vlen > 0) {
+    if (vlen > 0)
+    {
         *out++ = basis_64[value[0] >> 2];
         unsigned char oval = (value[0] << 4) & 0x30;
-        if (vlen > 1)
-            oval |= value[1] >> 4;
+        if (vlen > 1) oval |= value[1] >> 4;
         *out++ = basis_64[oval];
         *out++ = (vlen < 2) ? '=' : basis_64[(value[1] << 2) & 0x3C];
         *out++ = '=';
@@ -79,42 +76,48 @@ char* base64_encode(const unsigned char* value, int vlen) {
 // value            :    c-str to decode
 // rlen             :    length of decoded result
 // (result)         :    new unsigned char[] - decoded result
-unsigned char* base64_decode(const char* value, int* rlen) {
+unsigned char *base64_decode(const char *value, size_t *rlen)
+{
     *rlen = 0;
     int c1, c2, c3, c4;
 
-    int vlen = strlen(value);
-    unsigned char* result = (unsigned char*)malloc((vlen * 3) / 4 + 1);
+    size_t vlen = strlen(value);
+    unsigned char *result =(unsigned char *)malloc((vlen * 3) / 4 + 1);
     if (result == NULL)
-        die2("Memory allocation failed");
-    unsigned char* out = result;
+    {
+        return NULL;
+    }
+    unsigned char *out = result;
 
     while (1) {
-        if (value[0] == 0)
+        if (value[0]==0) {
             return result;
+        }
         c1 = value[0];
-        if (CHAR64(c1) == -1)
-            goto base64_decode_error;
-        ;
+        if (CHAR64(c1) == -1) {
+            goto base64_decode_error;;
+        }
         c2 = value[1];
-        if (CHAR64(c2) == -1)
-            goto base64_decode_error;
-        ;
+        if (CHAR64(c2) == -1) {
+            goto base64_decode_error;;
+        }
         c3 = value[2];
-        if ((c3 != '=') && (CHAR64(c3) == -1))
-            goto base64_decode_error;
-        ;
+        if ((c3 != '=') && (CHAR64(c3) == -1)) {
+            goto base64_decode_error;;
+        }
         c4 = value[3];
-        if ((c4 != '=') && (CHAR64(c4) == -1))
-            goto base64_decode_error;
-        ;
+        if ((c4 != '=') && (CHAR64(c4) == -1)) {
+            goto base64_decode_error;;
+        }
 
         value += 4;
         *out++ = (CHAR64(c1) << 2) | (CHAR64(c2) >> 4);
         *rlen += 1;
+
         if (c3 != '=') {
             *out++ = ((CHAR64(c2) << 4) & 0xf0) | (CHAR64(c3) >> 2);
             *rlen += 1;
+
             if (c4 != '=') {
                 *out++ = ((CHAR64(c3) << 6) & 0xc0) | CHAR64(c4);
                 *rlen += 1;
@@ -125,5 +128,6 @@ unsigned char* base64_decode(const char* value, int* rlen) {
 base64_decode_error:
     *result = 0;
     *rlen = 0;
+
     return result;
 }

src/base64.h

@@ -16,7 +16,9 @@
 #ifndef BASE64_H
 #define BASE64_H
 
-char* base64_encode(const unsigned char* value, int vlen);
-unsigned char* base64_decode(const char* value, int* rlen);
+#include <stddef.h>
 
-#endif
+char* base64_encode(const unsigned char* value, size_t vlen);
+unsigned char* base64_decode(const char* value, size_t* rlen);
+
+#endif

src/kerberos_gss.cc

@@ -242,7 +242,7 @@ gss_result* authenticate_gss_client_step(gss_client_state* state, const char* ch
     if (challenge && *challenge)
     {
         size_t len;
-        input_token.value = base64_decode(challenge, (int *) &len);
+        input_token.value = base64_decode(challenge, &len);
         input_token.length = len;
     }
 
@@ -339,7 +339,7 @@ gss_result* authenticate_gss_client_unwrap(gss_client_state *state, const char *
     if (challenge && *challenge)
     {
         size_t len;
-        input_token.value = base64_decode(challenge, (int *) &len);
+        input_token.value = base64_decode(challenge, &len);
         input_token.length = len;
     }
 
@@ -395,7 +395,7 @@ gss_result* authenticate_gss_client_wrap(gss_client_state* state, const char* ch
     if (challenge && *challenge)
     {
         size_t len;
-        input_token.value = base64_decode(challenge, (int *) &len);
+        input_token.value = base64_decode(challenge, &len);
         input_token.length = len;
     }
 
@@ -560,7 +560,7 @@ gss_result* authenticate_gss_server_step(gss_server_state *state, const char *ch
     if (challenge && *challenge)
     {
         size_t len;
-        input_token.value = base64_decode(challenge, (int *) &len);
+        input_token.value = base64_decode(challenge, &len);
         input_token.length = len;
     }
     else
@@ -703,4 +703,8 @@ static gss_result* gss_error_result_with_message_and_code(const char* message, i
     sprintf(msg, "%s (%d)", message, code);
     result->message = msg;
     return result;
-}
+}
+
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif