Implement AES in different modes of operation, using AES-NI and

nss/lib/freebl/rijndael.c

 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifdef FREEBL_NO_DEPEND
 #include "stubs.h"
 #endif
 
 #include "prinit.h"
 #include "prerr.h"
@@ skipping 1153 matching lines @@
         {
         cx->worker_cx = GCM_CreateContext(cx, cx->worker, iv, blocksize);
         cx->worker = (freeblCipherFunc)
                         (encrypt ? GCM_EncryptUpdate : GCM_DecryptUpdate);
         cx->destroy = (freeblDestroyFunc) GCM_DestroyContext;
         cx->isBlock = PR_FALSE;
         }
         break;
     case NSS_AES_CTR:
         cx->worker_cx = CTR_CreateContext(cx, cx->worker, iv, blocksize);
-        cx->worker = (freeblCipherFunc) CTR_Update ;
+#if defined(USE_HW_AES) && defined(_MSC_VER)
+        if (use_hw_aes)
+            cx->worker = (freeblCipherFunc) CTR_Update_HW_AES;
+        else
+#endif
+            cx->worker = (freeblCipherFunc) CTR_Update;

[Ryan Sleevi, 2014/04/23 19:53:34]

Seems better to use explicit braces in this conditional to avoid any goto fail
shenanigans

[wtc, 2014/04/24 01:04:10]

Done.

         cx->destroy = (freeblDestroyFunc) CTR_DestroyContext;
         cx->isBlock = PR_FALSE;
         break;
     default:
         /* everything has already been set up by aes_InitContext, just
          * return */
         return SECSuccess;
     }
     /* check to see if we succeeded in getting the worker context */
     if (cx->worker_cx == NULL) {
@@ skipping 99 matching lines @@
         return SECFailure;
     }
     if (maxOutputLen < inputLen) {
         PORT_SetError(SEC_ERROR_OUTPUT_LEN);
         return SECFailure;
     }
     *outputLen = inputLen;
     return (*cx->worker)(cx->worker_cx, output, outputLen, maxOutputLen,        
                              input, inputLen, blocksize);
 }