commit 341c70cce3fa0fda0842196fd47efe3e76e78296
author Tadeusz Struk <tadeusz.struk@intel.com> Mon May 14 16:35:41 2018 -0700
committer Andreas Fuchs <andreas.fuchs@sit.fraunhofer.de> Wed May 16 09:17:47 2018 +0200
tree af7b4a155c0a895aa08b52d5b46ae66c8fac0371
parent 3cc7543883ca97994c58e034d8859f047842ef33

esapi: pull Tss2_Sys_SetDecryptParam out of alg specific block

Pull Tss2_Sys_SetDecryptParam() out of algorithm specific conditional block.

Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>

src/tss2-esys/esys_iutil.c

diff --git a/src/tss2-esys/esys_iutil.c b/src/tss2-esys/esys_iutil.c
index 809bf0f..8f5f86d 100644
--- a/src/tss2-esys/esys_iutil.c
+++ b/src/tss2-esys/esys_iutil.c
@@ -660,9 +660,6 @@
                                                  &encrypt_buffer[0], paramSize,
                                                  &symKey[aes_off]);
                 return_if_error(r, "AES encryption not possible");
-                r = Tss2_Sys_SetDecryptParam(esys_context->sys, paramSize,
-                                             &encrypt_buffer[0]);
-                return_if_error(r, "Set encrypt parameter not possible");
             }
             /* XOR obfuscation of parameter */
             else if (symDef->algorithm == TPM2_ALG_XOR) {
@@ -674,14 +671,13 @@
                                                     &encrypt_buffer[0],
                                                     paramSize);
                 return_if_error(r, "XOR obfuscation not possible.");
-                r = Tss2_Sys_SetDecryptParam(esys_context->sys, paramSize,
-                                             &encrypt_buffer[0]);
-                return_if_error(r, "Set encrypt parameter not possible");
-
             } else {
                 return_error(TSS2_ESYS_RC_BAD_VALUE,
                              "Invalid symmetric algorithm (should be XOR or AES)");
             }
+            r = Tss2_Sys_SetDecryptParam(esys_context->sys, paramSize,
+                                         &encrypt_buffer[0]);
+            return_if_error(r, "Set encrypt parameter not possible");
         }
     }
     return r;