Skip to content

crypto: use OPENSSL_SIZE_T instead of hard coding int #66752

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

Open
aduh95 wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −6
Open

crypto: use OPENSSL_SIZE_T instead of hard coding int #66752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/crypto/crypto_common.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ StackOfX509 CloneSSLCerts(X509Pointer&& cert,
if (!peer_certs) return StackOfX509();
if (cert && !sk_X509_push(peer_certs.get(), cert.release()))
return StackOfX509();
for (int i = 0; i < sk_X509_num(ssl_certs); i++) {
for (OPENSSL_SIZE_T i = 0; i < sk_X509_num(ssl_certs); i++) {
X509Pointer cert(X509_dup(sk_X509_value(ssl_certs, i)));
if (!cert || !sk_X509_push(peer_certs.get(), cert.get()))
return StackOfX509();
Expand All @@ -106,7 +106,7 @@ MaybeLocal<Object> AddIssuerChainToObject(X509Pointer* cert,
Environment* const env) {
cert->reset(sk_X509_delete(peer_certs.get(), 0));
for (;;) {
int i;
OPENSSL_SIZE_T i;
for (i = 0; i < sk_X509_num(peer_certs.get()); i++) {
X509View ca(sk_X509_value(peer_certs.get(), i));
if (!cert->view().isIssuedBy(ca)) continue;
Expand Down
4 changes: 2 additions & 2 deletions src/crypto/crypto_context.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ int SSL_CTX_use_certificate_chain(SSL_CTX* ctx,
// the CA certificates.
SSL_CTX_clear_extra_chain_certs(ctx);

for (int i = 0; i < sk_X509_num(extra_certs); i++) {
for (OPENSSL_SIZE_T i = 0; i < sk_X509_num(extra_certs); i++) {
X509* ca = sk_X509_value(extra_certs, i);

// NOTE: Increments reference count on `ca`
Expand Down Expand Up @@ -2268,7 +2268,7 @@ void SecureContext::LoadPKCS12(const FunctionCallbackInfo<Value>& args) {
}

// Add CA certs too
for (int i = 0; i < sk_X509_num(extra_certs.get()); i++) {
for (OPENSSL_SIZE_T i = 0; i < sk_X509_num(extra_certs.get()); i++) {
X509* ca = sk_X509_value(extra_certs.get(), i);

X509_STORE_add_cert(sc->GetCertStoreOwnedByThisSecureContext(), ca);
Expand Down
2 changes: 1 addition & 1 deletion src/crypto/crypto_hash.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ void OneShotDigestWithMD(Environment* env,
enum encoding output_enc = ParseEncoding(isolate, args[4], args[5], HEX);

bool is_xof = (EVP_MD_flags(md) & EVP_MD_FLAG_XOF) != 0;
int output_length = EVP_MD_size(md);
OPENSSL_SIZE_T output_length = EVP_MD_size(md);

// This is to cause hash() to fail when an incorrect
// outputLength option was passed for a non-XOF hash function.
Expand Down
3 changes: 2 additions & 1 deletion src/crypto/crypto_x509.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -934,7 +934,8 @@ MaybeLocal<Object> X509Certificate::NewWithIssuers(
}

Local<Object> issuer;
if (issuer_chain != nullptr && start < sk_X509_num(issuer_chain)) {
if (issuer_chain != nullptr &&
static_cast<OPENSSL_SIZE_T>(start) < sk_X509_num(issuer_chain)) {
X509Pointer issuer_cert =
X509View(sk_X509_value(issuer_chain, start)).clone();
if (!issuer_cert) [[unlikely]] {
Expand Down
Loading