diff options
| author | Huie-Ying Lee <Huie-Ying.Lee@Sun.COM> | 2008-10-28 17:49:55 -0700 |
|---|---|---|
| committer | Huie-Ying Lee <Huie-Ying.Lee@Sun.COM> | 2008-10-28 17:49:55 -0700 |
| commit | 4789b5c5fb4ae740b75cc243d49a43df4f665dc5 (patch) | |
| tree | 764149015254ad2c5a1229cfd86d5b062a358bcc | |
| parent | b89a8333f5e1f75ec0c269b22524bd2eccb972ba (diff) | |
| download | illumos-joyent-4789b5c5fb4ae740b75cc243d49a43df4f665dc5.tar.gz | |
6734038 Apache SSL web server using the pkcs11 engine fails to start if meta slot is disabled
| -rw-r--r-- | usr/src/common/openssl/crypto/engine/hw_pk11.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/usr/src/common/openssl/crypto/engine/hw_pk11.c b/usr/src/common/openssl/crypto/engine/hw_pk11.c index 5030d5c477..2715c9feb3 100644 --- a/usr/src/common/openssl/crypto/engine/hw_pk11.c +++ b/usr/src/common/openssl/crypto/engine/hw_pk11.c @@ -3039,6 +3039,7 @@ pk11_choose_slots(int *any_slot_found) fprintf(stderr, "%s: this token has CKF_RNG flag\n", PK11_DBG); #endif /* DEBUG_SLOT_SELECTION */ pk11_have_random = CK_TRUE; + rand_SLOTID = current_slot; break; } } @@ -3046,6 +3047,8 @@ pk11_choose_slots(int *any_slot_found) #ifdef DEBUG_SLOT_SELECTION fprintf(stderr, "%s: == checking pubkey slots ==\n", PK11_DBG); #endif /* DEBUG_SLOT_SELECTION */ + + pubkey_SLOTID = pSlotList[0]; for (i = 0; i < ulSlotCount; i++) { CK_BBOOL slot_has_rsa = CK_FALSE; @@ -3168,6 +3171,8 @@ pk11_choose_slots(int *any_slot_found) #ifdef DEBUG_SLOT_SELECTION fprintf(stderr, "%s: == checking cipher/digest ==\n", PK11_DBG); #endif /* DEBUG_SLOT_SELECTION */ + + SLOTID = pSlotList[0]; for (i = 0; i < ulSlotCount; i++) { #ifdef DEBUG_SLOT_SELECTION |