Print this page
3882 remove xmod & friends

*** 238,248 **** * Initialize key schedules for blowfish */ static int init_keysched(crypto_key_t *key, void *keysched) { - /* EXPORT DELETE START */ /* * Only keys by value are supported by this module. */ switch (key->ck_format) { case CRYPTO_KEY_RAW: --- 238,247 ----
*** 254,264 **** default: return (CRYPTO_KEY_TYPE_INCONSISTENT); } blowfish_init_keysched(key->ck_data, key->ck_length, keysched); - /* EXPORT DELETE END */ return (CRYPTO_SUCCESS); } /* * KCF software provider control entry points. --- 253,262 ----
*** 276,288 **** static int blowfish_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) { - - /* EXPORT DELETE START */ - blowfish_ctx_t *blowfish_ctx; int rv; int kmflag; /* --- 274,283 ----
*** 318,329 **** return (rv); } ctx->cc_provider_private = blowfish_ctx; - /* EXPORT DELETE END */ - return (CRYPTO_SUCCESS); } static void blowfish_copy_block64(uint8_t *in, uint64_t *out) --- 313,322 ----
*** 343,354 **** blowfish_encrypt(crypto_ctx_t *ctx, crypto_data_t *plaintext, crypto_data_t *ciphertext, crypto_req_handle_t req) { int ret; - /* EXPORT DELETE START */ - blowfish_ctx_t *blowfish_ctx; /* * Plaintext must be a multiple of blowfish block size. * This test only works for non-padded mechanisms --- 336,345 ----
*** 376,387 **** */ ret = blowfish_encrypt_update(ctx, plaintext, ciphertext, req); ASSERT(blowfish_ctx->bc_remainder_len == 0); (void) blowfish_free_context(ctx); - /* EXPORT DELETE END */ - /* LINTED */ return (ret); } /* ARGSUSED */ --- 367,376 ----
*** 389,400 **** blowfish_decrypt(crypto_ctx_t *ctx, crypto_data_t *ciphertext, crypto_data_t *plaintext, crypto_req_handle_t req) { int ret; - /* EXPORT DELETE START */ - blowfish_ctx_t *blowfish_ctx; /* * Ciphertext must be a multiple of blowfish block size. * This test only works for non-padded mechanisms --- 378,387 ----
*** 422,433 **** */ ret = blowfish_decrypt_update(ctx, ciphertext, plaintext, req); ASSERT(blowfish_ctx->bc_remainder_len == 0); (void) blowfish_free_context(ctx); - /* EXPORT DELETE END */ - /* LINTED */ return (ret); } /* ARGSUSED */ --- 409,418 ----
*** 559,571 **** /* ARGSUSED */ static int blowfish_encrypt_final(crypto_ctx_t *ctx, crypto_data_t *data, crypto_req_handle_t req) { - - /* EXPORT DELETE START */ - blowfish_ctx_t *blowfish_ctx; ASSERT(ctx->cc_provider_private != NULL); blowfish_ctx = ctx->cc_provider_private; --- 544,553 ----
*** 578,600 **** return (CRYPTO_DATA_LEN_RANGE); (void) blowfish_free_context(ctx); data->cd_length = 0; - /* EXPORT DELETE END */ - return (CRYPTO_SUCCESS); } /* ARGSUSED */ static int blowfish_decrypt_final(crypto_ctx_t *ctx, crypto_data_t *data, crypto_req_handle_t req) { - - /* EXPORT DELETE START */ - blowfish_ctx_t *blowfish_ctx; ASSERT(ctx->cc_provider_private != NULL); blowfish_ctx = ctx->cc_provider_private; --- 560,577 ----
*** 607,618 **** return (CRYPTO_ENCRYPTED_DATA_LEN_RANGE); (void) blowfish_free_context(ctx); data->cd_length = 0; - /* EXPORT DELETE END */ - return (CRYPTO_SUCCESS); } /* ARGSUSED */ static int --- 584,593 ----
*** 795,807 **** static int blowfish_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 (!BLOWFISH_VALID_MECH(mechanism)) --- 770,779 ----
*** 823,834 **** } *tmpl = keysched; *tmpl_size = size; - /* EXPORT DELETE END */ - return (CRYPTO_SUCCESS); } /* ARGSUSED */ static int --- 795,804 ----
*** 857,868 **** crypto_spi_ctx_template_t *template, crypto_mechanism_t *mechanism, crypto_key_t *key, int kmflag) { int rv = CRYPTO_SUCCESS; - /* EXPORT DELETE START */ - void *keysched; size_t size; if (template == NULL) { if ((keysched = blowfish_alloc_keysched(&size, kmflag)) == NULL) --- 827,836 ----
*** 896,904 **** bzero(keysched, size); kmem_free(keysched, size); } } - /* EXPORT DELETE END */ - return (rv); } --- 864,870 ----