diff options
| author | Dan McDonald <danmcd@joyent.com> | 2021-08-05 11:28:17 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2021-08-05 11:28:21 -0400 |
| commit | e88d17a807e6087d6521eea44660f552179e872a (patch) | |
| tree | c44d92ae543a7d895f2064ba26162f80be823873 /usr/src/lib/krb5/plugins/preauth | |
| parent | 794800d939eaf7f2f9870efef3bbe171df64f87b (diff) | |
| parent | cb6ebde4d2e9718424e9027981a71f98e373d10d (diff) | |
| download | illumos-joyent-e88d17a807e6087d6521eea44660f552179e872a.tar.gz | |
[illumos-gate merge]
commit cb6ebde4d2e9718424e9027981a71f98e373d10d
13710 create_ramdisk: prepare cpio boot archive for sparc
commit 40218bdb5639ffca8a4bf8a1697cf2d6a8d875e2
13993 loader: tftp client should use server address from rootip
commit 8914555476924f9788507968bd2eb71da689dcc4
13991 loader.efi: check return value from malloc
commit dc7739930da754fee6930428942636e4857201e7
13953 tran_destroy_pkt is presumably not an alternative to itself in tran_setup_pkt(9E)
commit 41de07bd56f0c6833f260525e40c1f1bf295e9b2
13947 Typo in scsi_hba_attach_setup(9F)
commit 6ff4183c538023f1acb277f9d3b05296bb816e66
13985 Support building with OpenSSL 3.0
commit 575694f6d7409fab127e6f2f326e13a764cc9a00
13354 illumos should calibrate the TSC earlier in the boot process.
commit 5d228828cbfb65f9632a1eedca4291380fca8303
13926 core files can fail to dump leading large sections
13927 core dump of PROT_NONE segment leads to confusing behavior
Conflicts:
usr/src/uts/common/exec/elf/elf.c
Diffstat (limited to 'usr/src/lib/krb5/plugins/preauth')
| -rw-r--r-- | usr/src/lib/krb5/plugins/preauth/pkinit/pkinit_crypto_openssl.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/usr/src/lib/krb5/plugins/preauth/pkinit/pkinit_crypto_openssl.c b/usr/src/lib/krb5/plugins/preauth/pkinit/pkinit_crypto_openssl.c index 1dc79baa0a..8a6ad8b387 100644 --- a/usr/src/lib/krb5/plugins/preauth/pkinit/pkinit_crypto_openssl.c +++ b/usr/src/lib/krb5/plugins/preauth/pkinit/pkinit_crypto_openssl.c @@ -4542,7 +4542,11 @@ pkinit_find_private_key(pkinit_identity_crypto_context id_cryptoctx, CK_ATTRIBUTE attrs[4]; CK_ULONG count; CK_KEY_TYPE keytype; +#if OPENSSL_VERSION_NUMBER >= 0x30000000L + const RSA *rsa; +#else RSA *rsa; +#endif unsigned int nattrs = 0; int r; #ifdef PKINIT_USE_KEY_USAGE |