xnu-6153.141.1.tar.gz

[apple/xnu.git] / EXTERNAL_HEADERS / corecrypto / ccdrbg.h

diff --git a/EXTERNAL_HEADERS/corecrypto/ccdrbg.h b/EXTERNAL_HEADERS/corecrypto/ccdrbg.h
index 7ab4f491df11cd370f33b96f262ede012eef47a0..14db0a16bc7de4d53c84d1524429aa5ab619ddd1 100644 (file)
--- a/EXTERNAL_HEADERS/corecrypto/ccdrbg.h
+++ b/EXTERNAL_HEADERS/corecrypto/ccdrbg.h
@@ -21,28 +21,18 @@
 #include <corecrypto/cc.h>
 #include <corecrypto/ccdrbg_impl.h>
 
 #include <corecrypto/cc.h>
 #include <corecrypto/ccdrbg_impl.h>
 

-/* error codes */
-#define CCDRBG_STATUS_OK 0
-#define CCDRBG_STATUS_ERROR (-1)
-#define CCDRBG_STATUS_NEED_RESEED (-2)
-#define CCDRBG_STATUS_PARAM_ERROR (-3)
-// If this value is returned, the caller must abort or panic the process for security reasons.
-// for example in the case of catastrophic error in
-// http://csrc.nist.gov/publications/drafts/800-90/sp800_90a_r1_draft.pdf
-// ccdrbg calls abort() or panic(), if they are available in the system.
-#define CCDRBG_STATUS_ABORT (-4)

 /*
 /*

- * The maximum length of the entropy_input,  additional_input (max_additional_input_length) , personalization string 
+ * The maximum length of the entropy_input,  additional_input (max_additional_input_length) , personalization string

  * (max_personalization_string_length) and max_number_of_bits_per_request  are implementation dependent
  * (max_personalization_string_length) and max_number_of_bits_per_request  are implementation dependent

- * but shall fit in a 32 bit register and be be less than or equal to the specified maximum length for the 
+ * but shall fit in a 32 bit register and be be less than or equal to the specified maximum length for the

  * selected DRBG mechanism (NIST 800-90A Section 10).
  */
 
 #define CCDRBG_MAX_ENTROPY_SIZE         ((uint32_t)1<<16)
 #define CCDRBG_MAX_ADDITIONALINPUT_SIZE ((uint32_t)1<<16)
 #define CCDRBG_MAX_PSINPUT_SIZE         ((uint32_t)1<<16)
  * selected DRBG mechanism (NIST 800-90A Section 10).
  */
 
 #define CCDRBG_MAX_ENTROPY_SIZE         ((uint32_t)1<<16)
 #define CCDRBG_MAX_ADDITIONALINPUT_SIZE ((uint32_t)1<<16)
 #define CCDRBG_MAX_PSINPUT_SIZE         ((uint32_t)1<<16)

-#define CCDRBG_MAX_REQUEST_SIZE         ((uint32_t)1<<16) //this is the the absolute maximum in NIST 800-90A
-#define CCDRBG_RESEED_INTERVAL          ((uint64_t)1<<30) // must be able to fit the NIST maximum of 2^48
+#define CCDRBG_MAX_REQUEST_SIZE         ((uint32_t)1<<16) //this is the absolute maximum in NIST 800-90A
+#define CCDRBG_RESEED_INTERVAL          ((uint64_t)1<<48) // must be able to fit the NIST maximum of 2^48

 
 
 /*
 
 
 /*


@@ -87,18 +77,18 @@ CC_INLINE void ccdrbg_done(const struct ccdrbg_info *info,
        info->done(drbg);
 }
 
        info->done(drbg);
 }
 

-CC_INLINE size_t ccdrbg_context_size(const struct ccdrbg_info *drbg)
+CC_INLINE size_t ccdrbg_context_size(const struct ccdrbg_info *info)

 {
 {

-    return drbg->size;
+    return info->size;

 }
 
 
 /*
  * NIST SP 800-90 CTR_DRBG
 }
 
 
 /*
  * NIST SP 800-90 CTR_DRBG

- * the mximum security strengh of drbg equals to the block size of the corresponding ECB.
+ * the maximum security strengh of drbg equals to the block size of the corresponding ECB.

  */
 struct ccdrbg_nistctr_custom {
  */
 struct ccdrbg_nistctr_custom {

-    const struct ccmode_ecb *ecb;
+    const struct ccmode_ctr *ctr_info;

     size_t keylen;
     int strictFIPS;
     int use_df;
     size_t keylen;
     int strictFIPS;
     int use_df;


@@ -110,8 +100,6 @@ void ccdrbg_factory_nistctr(struct ccdrbg_info *info, const struct ccdrbg_nistct
  * NIST SP 800-90 HMAC_DRBG
  * the maximum security strengh of drbg is half of output size of the input hash function and it internally is limited to 256 bits
  */
  * NIST SP 800-90 HMAC_DRBG
  * the maximum security strengh of drbg is half of output size of the input hash function and it internally is limited to 256 bits
  */

-extern struct ccdrbg_info ccdrbg_nistdigest_info;
-

 struct ccdrbg_nisthmac_custom {
     const struct ccdigest_info *di;
     int strictFIPS;
 struct ccdrbg_nisthmac_custom {
     const struct ccdigest_info *di;
     int strictFIPS;


@@ -119,10 +107,4 @@ struct ccdrbg_nisthmac_custom {
 
 void ccdrbg_factory_nisthmac(struct ccdrbg_info *info, const struct ccdrbg_nisthmac_custom *custom);
 
 
 void ccdrbg_factory_nisthmac(struct ccdrbg_info *info, const struct ccdrbg_nisthmac_custom *custom);
 

-
-/*
- * Dummy DRBG
- */
-extern struct ccdrbg_info ccdrbg_dummy_info;
-

 #endif /* _CORECRYPTO_CCDRBG_H_ */
 #endif /* _CORECRYPTO_CCDRBG_H_ */