Print this page
first pass
@@ -304,12 +304,10 @@
*ctx = p;
}
return (rv);
}
-/* EXPORT DELETE START */
-
/*
* Initialize key schedules for AES
*/
static int
init_keysched(crypto_key_t *key, void *newbie)
@@ -334,12 +332,10 @@
aes_init_keysched(key->ck_data, key->ck_length, newbie);
return (CRYPTO_SUCCESS);
}
-/* EXPORT DELETE END */
-
/*
* KCF software provider control entry points.
*/
/* ARGSUSED */
static void
@@ -370,13 +366,10 @@
static int
aes_common_init(crypto_ctx_t *ctx, crypto_mechanism_t *mechanism,
crypto_key_t *key, crypto_spi_ctx_template_t template,
crypto_req_handle_t req, boolean_t is_encrypt_init)
{
-
-/* EXPORT DELETE START */
-
aes_ctx_t *aes_ctx;
int rv;
int kmflag;
/*
@@ -398,12 +391,10 @@
return (rv);
}
ctx->cc_provider_private = aes_ctx;
-/* EXPORT DELETE END */
-
return (CRYPTO_SUCCESS);
}
static void
aes_copy_block64(uint8_t *in, uint64_t *out)
@@ -425,12 +416,10 @@
aes_encrypt(crypto_ctx_t *ctx, crypto_data_t *plaintext,
crypto_data_t *ciphertext, crypto_req_handle_t req)
{
int ret = CRYPTO_FAILED;
-/* EXPORT DELETE START */
-
aes_ctx_t *aes_ctx;
size_t saved_length, saved_offset, length_needed;
ASSERT(ctx->cc_provider_private != NULL);
aes_ctx = ctx->cc_provider_private;
@@ -532,12 +521,10 @@
}
ASSERT(aes_ctx->ac_remainder_len == 0);
(void) aes_free_context(ctx);
-/* EXPORT DELETE END */
-
return (ret);
}
static int
@@ -544,12 +531,10 @@
aes_decrypt(crypto_ctx_t *ctx, crypto_data_t *ciphertext,
crypto_data_t *plaintext, crypto_req_handle_t req)
{
int ret = CRYPTO_FAILED;
-/* EXPORT DELETE START */
-
aes_ctx_t *aes_ctx;
off_t saved_offset;
size_t saved_length, length_needed;
ASSERT(ctx->cc_provider_private != NULL);
@@ -650,12 +635,10 @@
ASSERT(aes_ctx->ac_remainder_len == 0);
cleanup:
(void) aes_free_context(ctx);
-/* EXPORT DELETE END */
-
return (ret);
}
/* ARGSUSED */
@@ -823,13 +806,10 @@
/* ARGSUSED */
static int
aes_encrypt_final(crypto_ctx_t *ctx, crypto_data_t *data,
crypto_req_handle_t req)
{
-
-/* EXPORT DELETE START */
-
aes_ctx_t *aes_ctx;
int ret;
ASSERT(ctx->cc_provider_private != NULL);
aes_ctx = ctx->cc_provider_private;
@@ -876,23 +856,18 @@
data->cd_length = 0;
}
(void) aes_free_context(ctx);
-/* EXPORT DELETE END */
-
return (CRYPTO_SUCCESS);
}
/* ARGSUSED */
static int
aes_decrypt_final(crypto_ctx_t *ctx, crypto_data_t *data,
crypto_req_handle_t req)
{
-
-/* EXPORT DELETE START */
-
aes_ctx_t *aes_ctx;
int ret;
off_t saved_offset;
size_t saved_length;
@@ -985,12 +960,10 @@
data->cd_length = 0;
}
(void) aes_free_context(ctx);
-/* EXPORT DELETE END */
-
return (CRYPTO_SUCCESS);
}
/* ARGSUSED */
static int
@@ -1292,13 +1265,10 @@
static int
aes_create_ctx_template(crypto_provider_handle_t provider,
crypto_mechanism_t *mechanism, crypto_key_t *key,
crypto_spi_ctx_template_t *tmpl, size_t *tmpl_size, crypto_req_handle_t req)
{
-
-/* EXPORT DELETE START */
-
void *keysched;
size_t size;
int rv;
if (mechanism->cm_type != AES_ECB_MECH_INFO_TYPE &&
@@ -1325,22 +1295,17 @@
}
*tmpl = keysched;
*tmpl_size = size;
-/* EXPORT DELETE END */
-
return (CRYPTO_SUCCESS);
}
static int
aes_free_context(crypto_ctx_t *ctx)
{
-
-/* EXPORT DELETE START */
-
aes_ctx_t *aes_ctx = ctx->cc_provider_private;
if (aes_ctx != NULL) {
if (aes_ctx->ac_flags & PROVIDER_OWNS_KEY_SCHEDULE) {
ASSERT(aes_ctx->ac_keysched_len != 0);
@@ -1350,12 +1315,10 @@
}
crypto_free_mode_ctx(aes_ctx);
ctx->cc_provider_private = NULL;
}
-/* EXPORT DELETE END */
-
return (CRYPTO_SUCCESS);
}
static int
@@ -1362,13 +1325,10 @@
aes_common_init_ctx(aes_ctx_t *aes_ctx, crypto_spi_ctx_template_t *template,
crypto_mechanism_t *mechanism, crypto_key_t *key, int kmflag,
boolean_t is_encrypt_init)
{
int rv = CRYPTO_SUCCESS;
-
-/* EXPORT DELETE START */
-
void *keysched;
size_t size;
if (template == NULL) {
if ((keysched = aes_alloc_keysched(&size, kmflag)) == NULL)
@@ -1442,12 +1402,10 @@
bzero(keysched, size);
kmem_free(keysched, size);
}
}
-/* EXPORT DELETE END */
-
return (rv);
}
static int
process_gmac_mech(crypto_mechanism_t *mech, crypto_data_t *data,