diff --git a/CryptoPkg/Application/Cryptest/RsaVerify2.c b/CryptoPkg/Application/Cryptest/RsaVerify2.c
index adac99a9d7..b6fdfb5c38 100644
--- a/CryptoPkg/Application/Cryptest/RsaVerify2.c
+++ b/CryptoPkg/Application/Cryptest/RsaVerify2.c
@@ -214,7 +214,7 @@ ValidateCryptRsa2 (
   //
   Print (L"\n- Retrieve RSA Private Key for PEM ...");
   Status = RsaGetPrivateKeyFromPem (TestKeyPem, sizeof (TestKeyPem), PemPass, &RsaPrivKey);
-  if (Status == FALSE) {
+  if (!Status) {
     Print (L"[Fail]");
     return EFI_ABORTED;
   } else {
@@ -227,7 +227,7 @@ ValidateCryptRsa2 (
   Print (L"\n- Retrieve RSA Public Key from X509 ... ");
   RsaPubKey = NULL;
   Status    = RsaGetPublicKeyFromX509 (TestCert, sizeof (TestCert), &RsaPubKey);
-  if (Status == FALSE) {
+  if (!Status) {
     Print (L"[Fail]");
     return EFI_ABORTED;
   } else {
diff --git a/CryptoPkg/Library/BaseCryptLib/Pem/CryptPem.c b/CryptoPkg/Library/BaseCryptLib/Pem/CryptPem.c
index e9de39a105..bc5c93ff98 100644
--- a/CryptoPkg/Library/BaseCryptLib/Pem/CryptPem.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pem/CryptPem.c
@@ -1,7 +1,7 @@
 /** @file
   PEM (Privacy Enhanced Mail) Format Handler Wrapper Implementation over OpenSSL.
 
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -41,9 +41,9 @@ PasswordCallback (
     //
     // Duplicate key phrase directly.
     //
-    KeyLength = AsciiStrLen ((CHAR8 *)Key);
+    KeyLength = (INTN) AsciiStrLen ((CHAR8 *)Key);
     KeyLength = (KeyLength > Size ) ? Size : KeyLength;
-    CopyMem (Buf, Key, KeyLength);
+    CopyMem (Buf, Key, (UINTN) KeyLength);
     return KeyLength;
   } else {
     return 0;