diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7Verify.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7Verify.c
index ac481f7e68..745cf8729f 100644
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7Verify.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7Verify.c
@@ -242,8 +242,8 @@ X509PopCertificate (
   X509            *X509Cert;
   STACK_OF(X509)  *CertStack;
   BOOLEAN         Status;
-  int             Result;
-  int             Length;
+  INT32           Result;
+  INT32           Length;
   VOID            *Buffer;
 
   Status = FALSE;