Support openssl 1.1.0 #32
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
After looking at df45f3e I understand that a proper fix would be to override |
| #else | ||
| X509_OBJECT *obj = X509_OBJECT_new(); | ||
| rv = X509_STORE_get_by_subject(ctx, X509_LU_X509, X509_CRL_get_issuer(crl), obj); | ||
| #endif | ||
| if (rv <= 0) { | ||
| set_error("getting the certificate of the crl-issuer failed"); | ||
| return -1; | ||
| } | ||
| /* extract public key and verify signature */ | ||
| issuer_cert = X509_OBJECT_get0_X509((&obj)); |
There was a problem hiding this comment.
X509_OBJECT_get0_X509() seems to be introduced in 1.1.0 and not available in 1.0.2. Perhaps this could work.
#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
issuer_cert = obj.data.x509
#else
issuer_cert = X509_OBJECT_get0_X509((&obj));
#endif
There was a problem hiding this comment.
X509_OBJECT_get0_X509() is defined in https://github.com/OpenSC/pam_pkcs11/blob/master/src/common/pam-pkcs11-ossl-compat.h#L97 for OpenSSL < 1.1.0
| rv = X509_STORE_get_by_subject(ctx, X509_LU_CRL, X509_get_issuer_name(x509), &obj); | ||
| #else | ||
| rv = X509_STORE_get_by_subject(ctx, X509_LU_CRL, X509_get_issuer_name(x509), obj); | ||
| #endif | ||
| if (rv <= 0) { | ||
| set_error("no dedicated crl available"); | ||
| return -1; | ||
| } | ||
| crl = X509_OBJECT_get0_X509_CRL((&obj)); |
There was a problem hiding this comment.
Same here
#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
crl = obj.data.crl
#else
crl = X509_OBJECT_get0_X509_CRL((&obj));
#endif
bowb
pushed a commit
to bowb/pam_pkcs11
that referenced
this pull request
Mar 6, 2023
Support openssl 1.1.0
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This adapts the code to OpenSSL 1.1.0 changes and fixes #29.