Do not use deprecated ERR_load_ERR_strings() with OpenSSL 3.0
This commit is contained in:
parent
1b92501ef9
commit
fd96d2c960
|
@ -527,7 +527,9 @@ sc_pkcs15_prkey_attrs_from_cert(struct sc_pkcs15_card *p15card, struct sc_pkcs15
|
||||||
|
|
||||||
key_info = (struct sc_pkcs15_prkey_info *) key_object->data;
|
key_info = (struct sc_pkcs15_prkey_info *) key_object->data;
|
||||||
|
|
||||||
|
#if OPENSSL_VERSION_NUMBER < 0x30000000L
|
||||||
ERR_load_ERR_strings();
|
ERR_load_ERR_strings();
|
||||||
|
#endif
|
||||||
ERR_load_crypto_strings();
|
ERR_load_crypto_strings();
|
||||||
|
|
||||||
sc_log(ctx, "CertValue(%"SC_FORMAT_LEN_SIZE_T"u) %p",
|
sc_log(ctx, "CertValue(%"SC_FORMAT_LEN_SIZE_T"u) %p",
|
||||||
|
|
|
@ -769,7 +769,9 @@ awp_encode_key_info(struct sc_pkcs15_card *p15card, struct sc_pkcs15_object *obj
|
||||||
int r = 0;
|
int r = 0;
|
||||||
|
|
||||||
LOG_FUNC_CALLED(ctx);
|
LOG_FUNC_CALLED(ctx);
|
||||||
|
#if OPENSSL_VERSION_NUMBER < 0x30000000L
|
||||||
ERR_load_ERR_strings();
|
ERR_load_ERR_strings();
|
||||||
|
#endif
|
||||||
ERR_load_crypto_strings();
|
ERR_load_crypto_strings();
|
||||||
|
|
||||||
key_info = (struct sc_pkcs15_prkey_info *)obj->data;
|
key_info = (struct sc_pkcs15_prkey_info *)obj->data;
|
||||||
|
@ -827,7 +829,9 @@ awp_encode_key_info(struct sc_pkcs15_card *p15card, struct sc_pkcs15_object *obj
|
||||||
|
|
||||||
sc_log(ctx, "cosm_encode_key_info() label:%s",ki->label.value);
|
sc_log(ctx, "cosm_encode_key_info() label:%s",ki->label.value);
|
||||||
done:
|
done:
|
||||||
|
#if OPENSSL_VERSION_NUMBER < 0x30000000L
|
||||||
ERR_load_ERR_strings();
|
ERR_load_ERR_strings();
|
||||||
|
#endif
|
||||||
ERR_load_crypto_strings();
|
ERR_load_crypto_strings();
|
||||||
LOG_FUNC_RETURN(ctx, r);
|
LOG_FUNC_RETURN(ctx, r);
|
||||||
}
|
}
|
||||||
|
@ -933,7 +937,9 @@ awp_encode_cert_info(struct sc_pkcs15_card *p15card, struct sc_pkcs15_object *ob
|
||||||
|
|
||||||
LOG_FUNC_CALLED(ctx);
|
LOG_FUNC_CALLED(ctx);
|
||||||
|
|
||||||
|
#if OPENSSL_VERSION_NUMBER < 0x30000000L
|
||||||
ERR_load_ERR_strings();
|
ERR_load_ERR_strings();
|
||||||
|
#endif
|
||||||
ERR_load_crypto_strings();
|
ERR_load_crypto_strings();
|
||||||
|
|
||||||
if (!obj || !ci)
|
if (!obj || !ci)
|
||||||
|
|
Loading…
Reference in New Issue