Changeset 50904 in vbox

Timestamp:

Mar 27, 2014 5:00:13 AM (11 years ago)

Author:

vboxsync

Message:

added prefix X509 into all error definitions related to X509

Location:

trunk/src/VBox

Files:

• Main/src-server/ApplianceImplImport.cpp (modified) (2 diffs)
• Runtime/common/checksum/x509.cpp (modified) (9 diffs)

trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp

@@ -2134 +2134 @@
                 switch(vrc)
                 {
-                    case VERR_READING_CERT_FROM_BIO:
+                    case VERR_X509_READING_CERT_FROM_BIO:
                         errStrDesc = "Error during reading a certificate in PEM format from BIO ";
                         break;
-                    case VERR_EXTRACT_PUBKEY_FROM_CERT:
+                    case VERR_X509_EXTRACT_PUBKEY_FROM_CERT:
                         errStrDesc = "Error during extraction a public key from the certificate ";
                         break;
-                    case VERR_EXTRACT_RSA_FROM_PUBLIC_KEY:
+                    case VERR_X509_EXTRACT_RSA_FROM_PUBLIC_KEY:
                         errStrDesc = "Error during extraction RSA from the public key ";
                         break;
-                    case VERR_RSA_VERIFICATION_FUILURE:
+                    case VERR_X509_RSA_VERIFICATION_FUILURE:
                         errStrDesc = "RSA verification failure ";
                         break;
-                    case VERR_NO_BASIC_CONSTARAINTS:
+                    case VERR_X509_NO_BASIC_CONSTARAINTS:
                         errStrDesc = "Basic constraints were not found ";
                         break;
-                    case VERR_GETTING_EXTENSION_FROM_CERT:
+                    case VERR_X509_GETTING_EXTENSION_FROM_CERT:
                         errStrDesc = "Error during getting extensions from the certificate ";
                         break;
-                    case VERR_GETTING_DATA_FROM_EXTENSION:
+                    case VERR_X509_GETTING_DATA_FROM_EXTENSION:
                         errStrDesc = "Error during extraction data from the extension ";
                         break;
-                    case VERR_PRINT_EXTENSION_TO_BIO:
+                    case VERR_X509_PRINT_EXTENSION_TO_BIO:
                         errStrDesc = "Error during print out an extension to BIO ";
                         break;
@@ -2169 +2169 @@
         else
         {
-            if(vrc == VINF_NOT_SELFSIGNED_X509_CERTIFICATE)
+            if(vrc == VINF_X509_NOT_SELFSIGNED_CERTIFICATE)
             {
                 setWarning(VBOX_E_FILE_ERROR, 

trunk/src/VBox/Runtime/common/checksum/x509.cpp

@@ -82 +82 @@
     BIO_free(bio_memory);
     if(!*out_cert)
-        rc = VERR_READING_CERT_FROM_BIO;
+        rc = VERR_X509_READING_CERT_FROM_BIO;
 
     return rc;
@@ -204 +204 @@
         if (evp_key == NULL)
         {
-            rc = VERR_EXTRACT_PUBKEY_FROM_CERT;
+            rc = VERR_X509_EXTRACT_PUBKEY_FROM_CERT;
             break;
         }
@@ -211 +211 @@
         if (rsa_key == NULL)
         {
-            rc = VERR_EXTRACT_RSA_FROM_PUBLIC_KEY;
+            rc = VERR_X509_EXTRACT_RSA_FROM_PUBLIC_KEY;
             break;
         }
@@ -224 +224 @@
         if (rc != 1)
         {
-            rc = VERR_RSA_VERIFICATION_FUILURE;
+            rc = VERR_X509_RSA_VERIFICATION_FUILURE;
         }
 
@@ -274 +274 @@
         if(loc == -1)
         {
-            rc = VERR_NO_BASIC_CONSTARAINTS;
+            rc = VERR_X509_NO_BASIC_CONSTARAINTS;
             break;
         }
@@ -281 +281 @@
         if(!ext)
         {
-            rc = VERR_GETTING_EXTENSION_FROM_CERT;
+            rc = VERR_X509_GETTING_EXTENSION_FROM_CERT;
             break;
         }
@@ -288 +288 @@
         if(!extdata)
         {
-            rc = VERR_GETTING_DATA_FROM_EXTENSION;
+            rc = VERR_X509_GETTING_DATA_FROM_EXTENSION;
             break;
         }
@@ -295 +295 @@
         if(!X509V3_EXT_print(bio_memory, ext, 0, 0))
         {
-            rc = VERR_PRINT_EXTENSION_TO_BIO;
+            rc = VERR_X509_PRINT_EXTENSION_TO_BIO;
             break;
         }
@@ -364 +364 @@
             else
             {
-                rc = VINF_NOT_SELFSIGNED_X509_CERTIFICATE;
+                rc = VINF_X509_NOT_SELFSIGNED_CERTIFICATE;
             }
         }
         else
         {
-            rc = VINF_NOT_SELFSIGNED_X509_CERTIFICATE;
+            rc = VINF_X509_NOT_SELFSIGNED_CERTIFICATE;
         }