@@ -30,10 +30,11 @@
 #define HEX_FORMAT	0x02
 #define IS_XOF		0x08
 #define TYPE_MD		0x10
 #define TYPE_HMAC	0x20
 #define TYPE_CMAC	0x40
+#define TYPE_MAC	0x80
 
 /*
  * This structure defines the per-instance state of a digest operation.
  */
 typedef struct DigestState {
@@ -980,11 +981,11 @@
     int data_len;
     DigestState *statePtr;
 
     /* Get data */
     data = Tcl_GetByteArrayFromObj(dataObj, &data_len);
-    if (data == NULL || data_len == 0) {
+    if (data == NULL) {
 	Tcl_SetResult(interp, "No data", NULL);
 	return TCL_ERROR;
     }
 
     /* Create state data structure */
@@ -1139,11 +1140,11 @@
 	}
     }
 
     /* Get options */
     for (idx = start; idx < objc; idx++) {
-	char *opt = Tcl_GetStringFromObj(objv[idx], NULL);
+	*opt = Tcl_GetStringFromObj(objv[idx], NULL);
 
 	if (opt[0] != '-') {
 	    break;
 	}