diff --git a/src/tpm2/Implementation.h b/src/tpm2/Implementation.h
index 54d7bf68..af2d529e 100644
--- a/src/tpm2/Implementation.h
+++ b/src/tpm2/Implementation.h
@@ -253,7 +253,7 @@
 #define ALG_CAMELLIA                    ALG_NO      /* Not specified by vendor */
 #define ALG_CBC                         ALG_YES
 #define ALG_CFB                         ALG_YES
-#define ALG_CMAC                        ALG_NO
+#define ALG_CMAC                        ALG_YES
 #define ALG_CTR                         ALG_YES
 #define ALG_ECB                         ALG_YES
 #define ALG_ECC                         ALG_YES
diff --git a/src/tpm2/NVMarshal.c b/src/tpm2/NVMarshal.c
index 1175515c..ec94ebfa 100644
--- a/src/tpm2/NVMarshal.c
+++ b/src/tpm2/NVMarshal.c
@@ -3505,7 +3505,7 @@ static const struct _entry {
     { COMPILE_CONSTANT(ALG_KDF1_SP800_56A, EQ) },
     { COMPILE_CONSTANT(ALG_KDF2, LE) },
     { COMPILE_CONSTANT(ALG_KDF1_SP800_108, EQ) },
-    { COMPILE_CONSTANT(ALG_CMAC, EQ) },
+    { COMPILE_CONSTANT(ALG_CMAC, LE) },
     { COMPILE_CONSTANT(ALG_CTR, EQ) },
     { COMPILE_CONSTANT(ALG_OFB, EQ) },
     { COMPILE_CONSTANT(ALG_CBC, EQ) },