Add GCM, CTR, and CTS modes to AES.

nss/mozilla/security/nss/lib/freebl/blapii.h

 /*
  * blapii.h - private data structures and prototypes for the crypto library
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
@@ skipping 22 matching lines @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #ifndef _BLAPII_H_
 #define _BLAPII_H_
 
 #include "blapit.h"
 
+#define MAX_BLOCK_SIZE 16

[Ryan Sleevi, 2012/09/11 19:34:30]

nit: It seems useful to add a comment here explaining this, much like found
within SFTK_MAX_BLOCK_SIZE

/** max block size of supported block ciphers */

+
+typedef SECStatus (*freeblCipherFunc)(void *cx, unsigned char *output,

[Ryan Sleevi, 2012/09/11 19:34:30]

I think it would be helpful if you could document here what the expectations
are.

Most notably:
- Is there a requirement that inputLen is a multiple of blocksize?
  - If not, what is the handling mode?
- What is the expectation if inputLen = 0 (for an "empty block")?

[wtc, 2012/09/14 01:16:42]

I looked into this. I found that freeblDestroyFunc can be
a block cipher (in ECB or CBC/no-padding mode) or a stream
cipher (CTR, CTS, and GCM), so it's not easy to document
the expectations here.

I chose to document what ctr.h, cts.h, and gcm.h expect of
their |cipher| input argument. The downside of that approach
is that I had to replicate the freeblCipherFunc function
prototype in those headers, so that I can talk about the
inputLen and blocksize arguments.

+                          unsigned int *outputLen, unsigned int maxOutputLen,
+                          const unsigned char *input, unsigned int inputLen,
+                          unsigned int blocksize);
+typedef SECStatus (*freeblDestroyFunc)(void *cx, PRBool freeit);
+
 SEC_BEGIN_PROTOS
 
 #if defined(XP_UNIX) && !defined(NO_FORK_CHECK)
 
 extern PRBool bl_parentForkedAfterC_Initialize;
 
 #define SKIP_AFTER_FORK(x) if (!bl_parentForkedAfterC_Initialize) x
 
 #else
 
 #define SKIP_AFTER_FORK(x) x
 
 #endif
 

[Ryan Sleevi, 2012/09/11 19:34:30]

nit: unnecessary newline?

+
 SEC_END_PROTOS
 
 #endif /* _BLAPII_H_ */