Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FAB-18206] Cache object handles for PKCS#11 enabled BCCSP implementation #1767

Merged
merged 6 commits into from
Aug 20, 2020
Merged

[FAB-18206] Cache object handles for PKCS#11 enabled BCCSP implementation #1767

merged 6 commits into from
Aug 20, 2020

Conversation

sykesm
Copy link
Contributor

@sykesm sykesm commented Aug 19, 2020

No description provided.

@sykesm
Merge pkcs11/impl.go and pkcs11/pkcs11.go
243a56c 
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
@sykesm
Replace loadLib with initialize method
855f0fc 
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
@sykesm
Make findKeyPairFromSKI a method on impl
4c0dcb2 
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
@sykesm
Make ecPoint a method on impl
c85b550 
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
@sykesm
Add object handle cache to PKCS#11 bccsp provider
ed2a291 
With this change, object handles obtained through findKeyPairFromSKI are
cached in the PKCS#11 implementation of BCCSP.

In support of this change, in addition to pooling idle sessions, the
provider tracks active sessions. If some condition occurs that results
in all sessions being closed, cached object handles are no longer valid
so the handle cache is purged.

Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
@sykesm
Cache bccsp keys generated from getECKey
d9fa8c3 
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
@sykesm sykesm marked this pull request as ready for review August 19, 2020 19:44
@sykesm sykesm requested a review from a team as a code owner August 19, 2020 19:44
mastersingh24
mastersingh24 approved these changes Aug 20, 2020
View reviewed changes
Copy link
Contributor

@mastersingh24 mastersingh24 left a comment

Choose a reason for hiding this comment

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

LGTM

@mastersingh24 mastersingh24 merged commit 023b707 into hyperledger:master Aug 20, 2020
@mastersingh24
Copy link
Contributor

@Mergifyio backport release-2.2

@mastersingh24
Copy link
Contributor

@Mergifyio backport release-2.1

@mastersingh24
Copy link
Contributor

mastersingh24 commented Aug 20, 2020 •
edited
Loading

Will need to manually backport

@mergify
Copy link

mergify bot commented Aug 20, 2020

Command backport release-2.2: failure

No backport have been created

  • Backport to branch release-2.2 failed

Cherry-pick of bebe5c5 has failed:

On branch mergify/bp/release-2.2/pr-1767
Your branch is up to date with 'origin/release-2.2'.

You are currently cherry-picking commit bebe5c59d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   bccsp/pkcs11/pkcs11.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)

	deleted by them: bccsp/pkcs11/impl.go
	deleted by them: bccsp/pkcs11/impl_test.go
	both modified:   bccsp/pkcs11/pkcs11_test.go

@mergify
Copy link

mergify bot commented Aug 20, 2020

Command backport release-2.1: failure

No backport have been created

  • Backport to branch release-2.1 failed

Cherry-pick of bebe5c5 has failed:

On branch mergify/bp/release-2.1/pr-1767
Your branch is up to date with 'origin/release-2.1'.

You are currently cherry-picking commit bebe5c59d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   bccsp/pkcs11/pkcs11.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)

	deleted by them: bccsp/pkcs11/impl.go
	deleted by them: bccsp/pkcs11/impl_test.go
	both modified:   bccsp/pkcs11/pkcs11_test.go

@mastersingh24 mastersingh24 mentioned this pull request Aug 20, 2020
Merged
@denyeart denyeart changed the title Cache object handles for PKCS#11 enabled BCCSP implementation [FAB-18206] Cache object handles for PKCS#11 enabled BCCSP implementation Sep 4, 2020
@sykesm sykesm deleted the bccsp-cache branch February 20, 2021 02:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mastersingh24 mastersingh24 mastersingh24 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@sykesm @mastersingh24