Print this page
first pass

@@ -313,17 +313,13 @@
     crypto_data_t *, crypto_data_t *);
 static int rsa_verify_common(rsa_mech_type_t, crypto_key_t *,
     crypto_data_t *, crypto_data_t *);
 static int compare_data(crypto_data_t *, uchar_t *);
 
-/* EXPORT DELETE START */
-
 static int core_rsa_encrypt(crypto_key_t *, uchar_t *, int, uchar_t *, int);
 static int core_rsa_decrypt(crypto_key_t *, uchar_t *, int, uchar_t *);
 
-/* EXPORT DELETE END */
-
 static crypto_kcf_provider_handle_t rsa_prov_handle = NULL;
 
 int
 _init(void)
 {

@@ -371,12 +367,10 @@
 static int
 check_mech_and_key(crypto_mechanism_t *mechanism, crypto_key_t *key)
 {
         int rv = CRYPTO_FAILED;
 
-/* EXPORT DELETE START */
-
         uchar_t *modulus;
         ssize_t modulus_len; /* In bytes */
 
         if (!RSA_VALID_MECH(mechanism))
                 return (CRYPTO_MECHANISM_INVALID);

@@ -395,12 +389,10 @@
         }
         if (modulus_len < MIN_RSA_KEYLENGTH_IN_BYTES ||
             modulus_len > MAX_RSA_KEYLENGTH_IN_BYTES)
                 return (CRYPTO_KEY_SIZE_RANGE);
 
-/* EXPORT DELETE END */
-
         return (rv);
 }
 
 void
 kmemset(uint8_t *buf, char pattern, size_t len)

@@ -596,12 +588,10 @@
 rsa_encrypt_common(rsa_mech_type_t mech_type, crypto_key_t *key,
     crypto_data_t *plaintext, crypto_data_t *ciphertext)
 {
         int rv = CRYPTO_FAILED;
 
-/* EXPORT DELETE START */
-
         int plen;
         uchar_t *ptptr;
         uchar_t *modulus;
         ssize_t modulus_len;
         uchar_t tmp_data[MAX_RSA_KEYLENGTH_IN_BYTES];

@@ -654,17 +644,13 @@
                         return (rv);
 
                 ciphertext->cd_length = modulus_len;
         }
 
-/* EXPORT DELETE END */
-
         return (rv);
 }
 
-/* EXPORT DELETE START */
-
 static int
 core_rsa_encrypt(crypto_key_t *key, uchar_t *in,
     int in_len, uchar_t *out, int is_public)
 {
         int rv;

@@ -702,12 +688,10 @@
         rv = rsa_encrypt(&k, in, in_len, out);
 
         return (rv);
 }
 
-/* EXPORT DELETE END */
-
 /* ARGSUSED */
 static int
 rsaprov_decrypt(crypto_ctx_t *ctx, crypto_data_t *ciphertext,
     crypto_data_t *plaintext, crypto_req_handle_t req)
 {

@@ -750,12 +734,10 @@
 rsa_decrypt_common(rsa_mech_type_t mech_type, crypto_key_t *key,
     crypto_data_t *ciphertext, crypto_data_t *plaintext)
 {
         int rv = CRYPTO_FAILED;
 
-/* EXPORT DELETE START */
-
         size_t plain_len;
         uchar_t *ctptr;
         uchar_t *modulus;
         ssize_t modulus_len;
         uchar_t plain_data[MAX_RSA_KEYLENGTH_IN_BYTES];

@@ -800,17 +782,13 @@
                         return (rv);
 
                 plaintext->cd_length = plain_len;
         }
 
-/* EXPORT DELETE END */
-
         return (rv);
 }
 
-/* EXPORT DELETE START */
-
 static int
 core_rsa_decrypt(crypto_key_t *key, uchar_t *in, int in_len, uchar_t *out)
 {
         int rv;
         uchar_t *modulus, *prime1, *prime2, *expo1, *expo2, *coef;

@@ -861,12 +839,10 @@
         rv = rsa_decrypt(&k, in, in_len, out);
 
         return (rv);
 }
 
-/* EXPORT DELETE END */
-
 /* ARGSUSED */
 static int
 rsa_sign_verify_common_init(crypto_ctx_t *ctx, crypto_mechanism_t *mechanism,
     crypto_key_t *key, crypto_spi_ctx_template_t ctx_template,
     crypto_req_handle_t req)

@@ -959,12 +935,10 @@
 rsa_digest_svrfy_common(digest_rsa_ctx_t *ctxp, crypto_data_t *data,
     crypto_data_t *signature, uchar_t flag)
 {
         int rv = CRYPTO_FAILED;
 
-/* EXPORT DELETE START */
-
         uchar_t digest[SHA512_DIGEST_LENGTH];
         /* The der_data size is enough for MD5 also */
         uchar_t der_data[SHA512_DIGEST_LENGTH + SHA2_DER_PREFIX_Len];
         ulong_t der_data_len;
         crypto_data_t der_cd;

@@ -1066,23 +1040,19 @@
                     signature);
         else
                 rv = rsa_verify_common(mech_type, ctxp->key, &der_cd,
                     signature);
 
-/* EXPORT DELETE END */
-
         return (rv);
 }
 
 static int
 rsa_sign_common(rsa_mech_type_t mech_type, crypto_key_t *key,
     crypto_data_t *data, crypto_data_t *signature)
 {
         int rv = CRYPTO_FAILED;
 
-/* EXPORT DELETE START */
-
         int dlen;
         uchar_t *dataptr, *modulus;
         ssize_t modulus_len;
         uchar_t tmp_data[MAX_RSA_KEYLENGTH_IN_BYTES];
         uchar_t plain_data[MAX_RSA_KEYLENGTH_IN_BYTES];

@@ -1147,12 +1117,10 @@
                         return (rv);
 
                 signature->cd_length = modulus_len;
         }
 
-/* EXPORT DELETE END */
-
         return (rv);
 }
 
 /* ARGSUSED */
 static int

@@ -1295,12 +1263,10 @@
 rsa_verify_common(rsa_mech_type_t mech_type, crypto_key_t *key,
     crypto_data_t *data, crypto_data_t *signature)
 {
         int rv = CRYPTO_FAILED;
 
-/* EXPORT DELETE START */
-
         uchar_t *sigptr, *modulus;
         ssize_t modulus_len;
         uchar_t plain_data[MAX_RSA_KEYLENGTH_IN_BYTES];
         uchar_t tmp_data[MAX_RSA_KEYLENGTH_IN_BYTES];
 

@@ -1344,12 +1310,10 @@
                 if (compare_data(data, (plain_data + modulus_len
                     - data_len)) != 0)
                         rv = CRYPTO_SIGNATURE_INVALID;
         }
 
-/* EXPORT DELETE END */
-
         return (rv);
 }
 
 /* ARGSUSED */
 static int

@@ -1501,12 +1465,10 @@
 rsa_verify_recover_common(rsa_mech_type_t mech_type, crypto_key_t *key,
     crypto_data_t *signature, crypto_data_t *data)
 {
         int rv = CRYPTO_FAILED;
 
-/* EXPORT DELETE START */
-
         size_t data_len;
         uchar_t *sigptr, *modulus;
         ssize_t modulus_len;
         uchar_t plain_data[MAX_RSA_KEYLENGTH_IN_BYTES];
         uchar_t tmp_data[MAX_RSA_KEYLENGTH_IN_BYTES];

@@ -1549,12 +1511,10 @@
         if ((rv = crypto_put_output_data(plain_data + modulus_len - data_len,
             data, data_len)) != CRYPTO_SUCCESS)
                 return (rv);
         data->cd_length = data_len;
 
-/* EXPORT DELETE END */
-
         return (rv);
 }
 
 /* ARGSUSED */
 static int