diff --git a/sdk/include/hv/base64.h b/sdk/include/hv/base64.h
index 84b8a53..eae147d 100644
--- a/sdk/include/hv/base64.h
+++ b/sdk/include/hv/base64.h
@@ -4,7 +4,7 @@
 #include "hexport.h"
 
 #define BASE64_ENCODE_OUT_SIZE(s)   (((s) + 2) / 3 * 4)
-#define BASE64_DECODE_OUT_SIZE(s)   (((s)) / 4 * 3)
+#define BASE64_DECODE_OUT_SIZE(s)   (((s) + 3) / 4 * 3)
 
 BEGIN_EXTERN_C
 
diff --git a/sdk/include/hv/hconfig.h b/sdk/include/hv/hconfig.h
index a63861f..3e063ad 100644
--- a/sdk/include/hv/hconfig.h
+++ b/sdk/include/hv/hconfig.h
@@ -89,7 +89,7 @@
 #define HAVE_SETPROCTITLE 0
 #endif
 
-#define WITH_OPENSSL   1
+/* #undef WITH_OPENSSL */
 /* #undef WITH_GNUTLS */
 /* #undef WITH_MBEDTLS */
 
diff --git a/sdk/include/hv/hlog.h b/sdk/include/hv/hlog.h
index 5836b90..15a575c 100644
--- a/sdk/include/hv/hlog.h
+++ b/sdk/include/hv/hlog.h
@@ -1,4 +1,4 @@
-#ifndef HV_LOG_H_
+#ifndef HV_LOG_H_
 #define HV_LOG_H_
 
 /*