Skip to content

Comments

feat: add sm2 encrypted test case from GM/T0003.5-2012 to test suite. And fix some place.#15869

Closed
ymj-uos wants to merge 0 commit intoopenssl:masterfrom
ymj-uos:master
Closed

feat: add sm2 encrypted test case from GM/T0003.5-2012 to test suite. And fix some place.#15869
ymj-uos wants to merge 0 commit intoopenssl:masterfrom
ymj-uos:master

Conversation

@ymj-uos
Copy link
Contributor

@ymj-uos ymj-uos commented Jun 23, 2021

Checklist
  • documentation is added or updated
  • tests are added or updated

Copy link
Contributor

@paulidale paulidale left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would be better added to test/recipes/30-test_evp_data/evppkey_sm2.txt

@paulidale paulidale added the branch: master Applies to master branch label Jun 23, 2021
@ymj-uos
Copy link
Contributor Author

ymj-uos commented Jun 23, 2021

in the evppkey_sm2.txt, it does not set random data, and it is not better to do the encryption and decryption.

@ymj-uos ymj-uos requested a review from paulidale June 28, 2021 01:14
@ymj-uos ymj-uos requested a review from paulidale June 29, 2021 01:13
@openssl-machine
Copy link
Collaborator

This PR is in a state where it requires action by @openssl/committers but the last update was 30 days ago

@t8m t8m added the triaged: feature The issue/pr requests/adds a feature label Aug 9, 2021
@t8m t8m added this to the Post 3.0.0 milestone Aug 9, 2021
@openssl-machine openssl-machine added the hold: cla required The contributor needs to submit a license agreement label Aug 25, 2021
@ymj-uos
Copy link
Contributor Author

ymj-uos commented Aug 25, 2021

image

I have to submit the ICLA and CCLA.

@kaduk
Copy link
Contributor

kaduk commented Aug 30, 2021

close/reopen to re-trigger the CLA check

@kaduk kaduk closed this Aug 30, 2021
@kaduk kaduk reopened this Aug 30, 2021
@romen romen closed this Sep 6, 2021
@romen romen reopened this Sep 6, 2021
@romen
Copy link
Member

romen commented Sep 6, 2021

It seems the CLA check is still failing. @mattcaswell can you check this?

@ymj-uos
Copy link
Contributor Author

ymj-uos commented Sep 6, 2021

image

@ymj-uos
Copy link
Contributor Author

ymj-uos commented Sep 6, 2021

How to change the email to the [email protected]!

@mspncp
Copy link
Contributor

mspncp commented Sep 6, 2021

How to change the email to the [email protected]!

You can edit your personal e-mail address(es) at https://github.com/settings/emails .

@ymj-uos
Copy link
Contributor Author

ymj-uos commented Sep 6, 2021

How to change the email to the [email protected]!

You can edit your personal e-mail address(es) at https://github.com/settings/emails .

How to change the email to the [email protected]!

You can edit your personal e-mail address(es) at https://github.com/settings/emails .

image

@mspncp
Copy link
Contributor

mspncp commented Sep 6, 2021

Your settings look good. Did set them just now or where they already set like this?

@ymj-uos
Copy link
Contributor Author

ymj-uos commented Sep 6, 2021

uncheck it! and what next... I have tried some ways, but not correct.

@mspncp
Copy link
Contributor

mspncp commented Sep 6, 2021

Changing the author email of an existing commit is not supported by the GitHub web interface. It needs to be done locally using the git commandline tool. Your pull request branch needs to be rebased anyway, because you have a merge commit from master, 975845d5c5f0881863be2493a7b91358d2ab3fad, which we don't allow.

If you want, I can do the rebase and force-push it to your remote branch. All you need to do then is to reset your local branch. Please let me know if you wan't me to do it.

@mspncp
Copy link
Contributor

mspncp commented Sep 6, 2021

I found your email address twice in the git log. If you want me to reset the author address of your commits, which of the two versions do you want me to use?

Author: Mingjun.Yang <[email protected]>
Author: 杨明君 <[email protected]>

@ymj-uos
Copy link
Contributor Author

ymj-uos commented Sep 6, 2021

Changing the author email of an existing commit is not supported by the GitHub web interface. It needs to be done locally using the git commandline tool. Your pull request branch needs to be rebased anyway, because you have a merge commit from master, 975845d, which we don't allow.

If you wan't, I can do the rebase and force-push it to your remote branch. All you need to do then is to reset your local branch. Please let me know if you wan't me to do it.

thanks! you can rebase my branch.

@ymj-uos
Copy link
Contributor Author

ymj-uos commented Sep 6, 2021

Mingjun.Yang [email protected]

Mingjun.Yang [email protected]

this one.

@mspncp
Copy link
Contributor

mspncp commented Sep 6, 2021

There is a merge conflict in test_sm2_crypt(). Variant A is on 'master', variant B on your branch. What is the correct merged version?

<<<<<<< variant A
    if (!TEST_true(ossl_sm2_plaintext_size(ctext, ctext_len, &ptext_len))
            || !TEST_int_eq(ptext_len, msg_len))
>>>>>>> variant B
    if (!TEST_true(ossl_sm2_plaintext_size(key, digest, ctext_len, &ptext_len))
            || !TEST_int_ge(ptext_len, msg_len))
####### Ancestor
    if (!TEST_true(ossl_sm2_plaintext_size(key, digest, ctext_len, &ptext_len))
            || !TEST_int_eq(ptext_len, msg_len))
======= end

@mspncp
Copy link
Contributor

mspncp commented Sep 6, 2021

I guess it's

    if (!TEST_true(ossl_sm2_plaintext_size(ctext, ctext_len, &ptext_len))
            || !TEST_int_ge(ptext_len, msg_len))

but I'm not sure.

@ymj-uos
Copy link
Contributor Author

ymj-uos commented Sep 6, 2021

if (!TEST_true(ossl_sm2_plaintext_size(ctext, ctext_len, &ptext_len))
|| !TEST_int_eq(ptext_len, msg_len))

please keep the origianl version!
if (!TEST_true(ossl_sm2_plaintext_size(ctext, ctext_len, &ptext_len))
|| !TEST_int_eq(ptext_len, msg_len))

During uploading my codes, the api is changed! so I fixed it.

@openssl-machine openssl-machine added hold: cla required The contributor needs to submit a license agreement and removed hold: cla required The contributor needs to submit a license agreement labels Sep 6, 2021
@mspncp
Copy link
Contributor

mspncp commented Sep 6, 2021

I rebased your branch and squashed the fixups into a single commit. Please reset your local branch and check the result.

@ymj-uos ymj-uos closed this Sep 6, 2021
@openssl-machine openssl-machine removed the hold: cla required The contributor needs to submit a license agreement label Sep 6, 2021
@mspncp
Copy link
Contributor

mspncp commented Sep 6, 2021

You just overwrote my changes with your force-push. I am going to force-push again...

@mspncp
Copy link
Contributor

mspncp commented Sep 6, 2021

Sorry, something changed, I don't seem to have the permission to push to your branch anymore.

@mspncp
Copy link
Contributor

mspncp commented Sep 6, 2021

Maybe it's better if you close this pr and open a new one? You find my rebased and squashed commit at bc37353a3649bd42e2c7b80a760fe55023812328.

I recommend that you create a topic branch for your pull request and don't reuse the 'master' branch of your fork.

@ymj-uos
Copy link
Contributor Author

ymj-uos commented Sep 6, 2021

@mspncp I open a new one.

@romen
Copy link
Member

romen commented Sep 6, 2021

Closed in favour of #16511

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch: master Applies to master branch triaged: feature The issue/pr requests/adds a feature

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants