Print this page
first pass

*** 304,315 **** *ctx = p; } return (rv); } - /* EXPORT DELETE START */ - /* * Initialize key schedules for AES */ static int init_keysched(crypto_key_t *key, void *newbie) --- 304,313 ----
*** 334,345 **** 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 --- 332,341 ----
*** 370,382 **** 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; /* --- 366,375 ----
*** 398,409 **** 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) --- 391,400 ----
*** 425,436 **** 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; --- 416,425 ----
*** 532,543 **** } ASSERT(aes_ctx->ac_remainder_len == 0); (void) aes_free_context(ctx); - /* EXPORT DELETE END */ - return (ret); } static int --- 521,530 ----
*** 544,555 **** 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); --- 531,540 ----
*** 650,661 **** ASSERT(aes_ctx->ac_remainder_len == 0); cleanup: (void) aes_free_context(ctx); - /* EXPORT DELETE END */ - return (ret); } /* ARGSUSED */ --- 635,644 ----
*** 823,835 **** /* 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; --- 806,815 ----
*** 876,898 **** 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; --- 856,873 ----
*** 985,996 **** data->cd_length = 0; } (void) aes_free_context(ctx); - /* EXPORT DELETE END */ - return (CRYPTO_SUCCESS); } /* ARGSUSED */ static int --- 960,969 ----
*** 1292,1304 **** 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 && --- 1265,1274 ----
*** 1325,1346 **** } *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); --- 1295,1311 ----
*** 1350,1361 **** } crypto_free_mode_ctx(aes_ctx); ctx->cc_provider_private = NULL; } - /* EXPORT DELETE END */ - return (CRYPTO_SUCCESS); } static int --- 1315,1324 ----
*** 1362,1374 **** 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) --- 1325,1334 ----
*** 1442,1453 **** 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, --- 1402,1411 ----