Replace tabulators with spaces in ocsp.* files.

Change-Id: I08ae78cdf69aa7bd759097f2f0a3841f6f80e99b

diff --git a/src/manager/service/ocsp.cpp b/src/manager/service/ocsp.cpp
index 3cf1249..cca8c7a 100644 (file)
--- a/src/manager/service/ocsp.cpp
+++ b/src/manager/service/ocsp.cpp
@@ -41,11 +41,11 @@
 namespace CKM {
 
 OCSPModule::OCSPModule() {
-       // Do nothing.
+    // Do nothing.
 }
 
 OCSPModule::~OCSPModule(){
-       // Do nothing.
+    // Do nothing.
 }
 
 int OCSPModule::verify(const CertificateImplVector &certificateChain) {
@@ -82,35 +82,36 @@ int OCSPModule::verify(const CertificateImplVector &certificateChain) {
 
     if (unsupported)
         return CKM_API_OCSP_STATUS_UNSUPPORTED;
+
     return CKM_API_OCSP_STATUS_GOOD;
 }
 
 int OCSPModule::ocsp_verify(X509 *cert, X509 *issuer, STACK_OF(X509) *systemCerts, const std::string &constUrl) {
-       OCSP_REQUEST *req = NULL;
-       OCSP_RESPONSE *resp = NULL;
-       OCSP_BASICRESP *bs = NULL;
-       OCSP_CERTID *certid = NULL;
-       BIO *cbio = NULL;
-       SSL_CTX *use_ssl_ctx = NULL;
-       char *host = NULL, *port = NULL, *path = NULL;
-       ASN1_GENERALIZEDTIME *rev = NULL;
-       ASN1_GENERALIZEDTIME *thisupd = NULL;
-       ASN1_GENERALIZEDTIME *nextupd = NULL;
-       int use_ssl = 0;
+    OCSP_REQUEST *req = NULL;
+    OCSP_RESPONSE *resp = NULL;
+    OCSP_BASICRESP *bs = NULL;
+    OCSP_CERTID *certid = NULL;
+    BIO *cbio = NULL;
+    SSL_CTX *use_ssl_ctx = NULL;
+    char *host = NULL, *port = NULL, *path = NULL;
+    ASN1_GENERALIZEDTIME *rev = NULL;
+    ASN1_GENERALIZEDTIME *thisupd = NULL;
+    ASN1_GENERALIZEDTIME *nextupd = NULL;
+    int use_ssl = 0;
     int ocspStatus = -1;
-       int i = 0 ,tmpIdx = 0;
-       long nsec = MAX_VALIDITY_PERIOD, maxage = -1;
-       char subj_buf[256];
-       int reason = 0;
-       //    const char *reason_str = NULL;0
-       X509_STORE *trustedStore=NULL;
+    int i = 0 ,tmpIdx = 0;
+    long nsec = MAX_VALIDITY_PERIOD, maxage = -1;
+    char subj_buf[256];
+    int reason = 0;
+    //    const char *reason_str = NULL;0
+    X509_STORE *trustedStore=NULL;
 
     std::vector<char> url(constUrl.begin(), constUrl.end());
 
     if (!OCSP_parse_url(url.data(), &host, &port, &path, &use_ssl)) {
-               /* report error */
-               return CKM_API_OCSP_STATUS_INVALID_URL;
-       }
+        /* report error */
+        return CKM_API_OCSP_STATUS_INVALID_URL;
+    }
 
     LogDebug("Host: " << host);
     LogDebug("Port: " << port);
@@ -118,242 +119,242 @@ int OCSPModule::ocsp_verify(X509 *cert, X509 *issuer, STACK_OF(X509) *systemCert
     LogDebug("Use_ssl: " << use_ssl);
 
     cbio = BIO_new_connect(host);
-       if (cbio == NULL) {
-               /*BIO_printf(bio_err, "Error creating connect BIO\n");*/
-               /* report error */
-               return CKM_API_OCSP_STATUS_INTERNAL_ERROR;
-       }
+    if (cbio == NULL) {
+        /*BIO_printf(bio_err, "Error creating connect BIO\n");*/
+        /* report error */
+        return CKM_API_OCSP_STATUS_INTERNAL_ERROR;
+    }
 
        if (port != NULL) {
                BIO_set_conn_port(cbio, port);
-       }
+    }
 
-       if (use_ssl == 1) {
-               BIO *sbio = NULL;
-               use_ssl_ctx = SSL_CTX_new(SSLv23_client_method());
-               if (use_ssl_ctx == NULL) {
-                       /* report error */
+    if (use_ssl == 1) {
+        BIO *sbio = NULL;
+        use_ssl_ctx = SSL_CTX_new(SSLv23_client_method());
+        if (use_ssl_ctx == NULL) {
+            /* report error */
             return CKM_API_OCSP_STATUS_INTERNAL_ERROR;
-               }
-
-               SSL_CTX_set_mode(use_ssl_ctx, SSL_MODE_AUTO_RETRY);
-               sbio = BIO_new_ssl(use_ssl_ctx, 1);
-               if (sbio == NULL) {
-                       /* report error */
-                       return CKM_API_OCSP_STATUS_INTERNAL_ERROR;
-               }
-
-               cbio = BIO_push(sbio, cbio);
-               if (cbio == NULL) {
-                       /* report error */
-                       return CKM_API_OCSP_STATUS_INTERNAL_ERROR;
-               }
-       }
-
-       if (BIO_do_connect(cbio) <= 0) {
+        }
+
+        SSL_CTX_set_mode(use_ssl_ctx, SSL_MODE_AUTO_RETRY);
+        sbio = BIO_new_ssl(use_ssl_ctx, 1);
+        if (sbio == NULL) {
+            /* report error */
+            return CKM_API_OCSP_STATUS_INTERNAL_ERROR;
+        }
+
+        cbio = BIO_push(sbio, cbio);
+        if (cbio == NULL) {
+            /* report error */
+            return CKM_API_OCSP_STATUS_INTERNAL_ERROR;
+        }
+    }
+
+    if (BIO_do_connect(cbio) <= 0) {
         LogDebug("Error in BIO_do_connect.");
         ERR_print_errors_fp(stderr);
-               /*BIO_printf(bio_err, "Error connecting BIO\n");*/
-               /* report error */
+        /*BIO_printf(bio_err, "Error connecting BIO\n");*/
+        /* report error */
 
-               /* free stuff */
-               if (host != NULL) {
-                       OPENSSL_free(host);
-               }
+        /* free stuff */
+        if (host != NULL) {
+            OPENSSL_free(host);
+        }
 
-               if (port != NULL) {
-                       OPENSSL_free(port);
-               }
+        if (port != NULL) {
+            OPENSSL_free(port);
+        }
 
-               if (path != NULL) {
-                       OPENSSL_free(path);
-               }
-               host = port = path = NULL;
+        if (path != NULL) {
+            OPENSSL_free(path);
+        }
+        host = port = path = NULL;
 
-               if (use_ssl && use_ssl_ctx) {
-                       SSL_CTX_free(use_ssl_ctx);
-               }
-               use_ssl_ctx = NULL;
+        if (use_ssl && use_ssl_ctx) {
+            SSL_CTX_free(use_ssl_ctx);
+        }
+        use_ssl_ctx = NULL;
 
-               if (cbio != NULL) {
-                       BIO_free_all(cbio);
-               }
-               cbio = NULL;
+        if (cbio != NULL) {
+            BIO_free_all(cbio);
+        }
+        cbio = NULL;
 
-               return CKM_API_OCSP_STATUS_NET_ERROR;
-       }
+        return CKM_API_OCSP_STATUS_NET_ERROR;
+    }
 
-       req = OCSP_REQUEST_new();
+    req = OCSP_REQUEST_new();
 
-       if(req == NULL) {
+    if(req == NULL) {
         LogDebug("Error in OCPS_REQUEST_new");
-               return CKM_API_OCSP_STATUS_INTERNAL_ERROR;
-       }
-       certid = OCSP_cert_to_id(NULL, cert, issuer);
-       if(certid == NULL)  {
+        return CKM_API_OCSP_STATUS_INTERNAL_ERROR;
+    }
+    certid = OCSP_cert_to_id(NULL, cert, issuer);
+    if(certid == NULL)  {
         LogDebug("Error in OCSP_cert_to_id");
-               return CKM_API_OCSP_STATUS_INTERNAL_ERROR;
-       }
+        return CKM_API_OCSP_STATUS_INTERNAL_ERROR;
+    }
 
-       if(OCSP_request_add0_id(req, certid) == NULL) {
+    if(OCSP_request_add0_id(req, certid) == NULL) {
         LogDebug("Error in OCSP_request_add0_id");
-               return CKM_API_OCSP_STATUS_INTERNAL_ERROR;
-       }
+        return CKM_API_OCSP_STATUS_INTERNAL_ERROR;
+    }
 
-       resp = OCSP_sendreq_bio(cbio, path, req);
+    resp = OCSP_sendreq_bio(cbio, path, req);
 
-       /* free some stuff we no longer need */
-       if (host != NULL) {
-               OPENSSL_free(host);
-       }
+    /* free some stuff we no longer need */
+    if (host != NULL) {
+        OPENSSL_free(host);
+    }
 
-       if (port != NULL) {
-               OPENSSL_free(port);
-       }
-
-       if (path != NULL) {
-               OPENSSL_free(path);
-       }
-       host = port = path = NULL;
-
-       if (use_ssl && use_ssl_ctx) {
-               SSL_CTX_free(use_ssl_ctx);
-       }
-       use_ssl_ctx = NULL;
-
-       if (cbio != NULL) {
-               BIO_free_all(cbio);
-       }
-       cbio = NULL;
-
-       if (!resp) {
-               /*BIO_printf(bio_err, "Error querying OCSP responsder\n");*/
-               /* report error */
-               /* free stuff */
-               OCSP_REQUEST_free(req);
-               return CKM_API_OCSP_STATUS_NET_ERROR;
-       }
-
-       i = OCSP_response_status(resp);
-
-       if (i != OCSP_RESPONSE_STATUS_SUCCESSFUL) {
-               /*BIO_printf(out, "Responder Error: %s (%ld)\n",
-                   OCSP_response_status_str(i), i); */
-               /* report error */
-               /* free stuff */
-               OCSP_REQUEST_free(req);
-               OCSP_RESPONSE_free(resp);
-               return CKM_API_OCSP_STATUS_REMOTE_ERROR;
-       }
-
-       bs = OCSP_response_get1_basic(resp);
-       if (!bs) {
-               /* BIO_printf(bio_err, "Error parsing response\n");*/
-               /* report error */
-               /* free stuff */
-               OCSP_REQUEST_free(req);
-               OCSP_RESPONSE_free(resp);
-               return CKM_API_OCSP_STATUS_INVALID_RESPONSE;
-       }
-
-       if(systemCerts != NULL) {
-               trustedStore = X509_STORE_new();
-               for(tmpIdx=0; tmpIdx<sk_X509_num(systemCerts); tmpIdx++) {
-                       X509_STORE_add_cert(trustedStore, sk_X509_value(systemCerts, tmpIdx));
-               }
-               X509_STORE_add_cert(trustedStore, issuer);
-       }
-
-       int response = OCSP_basic_verify(bs, NULL, trustedStore, 0);
-       if (response <= 0) {
-               OCSP_REQUEST_free(req);
-               OCSP_RESPONSE_free(resp);
-               OCSP_BASICRESP_free(bs);
-               X509_STORE_free(trustedStore);
-               // find the reason of error
-               int err = ERR_get_error();
-               char errStr[100];
-               ERR_error_string(err,errStr);
-               // printf("OCSP_basic_verify fail.error = %s\n", errStr);
-               return CKM_API_OCSP_STATUS_INVALID_RESPONSE;
-       }
-
-       if ((i = OCSP_check_nonce(req, bs)) <= 0) {
-               if (i == -1) {
-                       /*BIO_printf(bio_err, "WARNING: no nonce in response\n");*/
-               } else {
-                       /*BIO_printf(bio_err, "Nonce Verify error\n");*/
-                       /* report error */
-                       /* free stuff */
-                       OCSP_REQUEST_free(req);
-                       OCSP_RESPONSE_free(resp);
-                       OCSP_BASICRESP_free(bs);
-                       X509_STORE_free(trustedStore);
-                       return CKM_API_OCSP_STATUS_INVALID_RESPONSE;
-               }
-       }
-
-       (void)X509_NAME_oneline(X509_get_subject_name(cert), subj_buf, 255);
-       if(!OCSP_resp_find_status(bs, certid, &ocspStatus, &reason,
-                       &rev, &thisupd, &nextupd)) {
-               /* report error */
-
-               /* free stuff */
-               OCSP_RESPONSE_free(resp);
-               OCSP_REQUEST_free(req);
-               OCSP_BASICRESP_free(bs);
-               X509_STORE_free(trustedStore);
-
-               return CKM_API_OCSP_STATUS_INVALID_RESPONSE;
-       }
-
-
-       /* Check validity: if invalid write to output BIO so we
-        * know which response this refers to.
-        */
-       if (!OCSP_check_validity(thisupd, nextupd, nsec, maxage)) {
-               /* ERR_print_errors(out); */
-               /* report error */
-
-               /* free stuff */
-               OCSP_REQUEST_free(req);
-               OCSP_RESPONSE_free(resp);
-               OCSP_BASICRESP_free(bs);
-               X509_STORE_free(trustedStore);
-
-               return CKM_API_OCSP_STATUS_INVALID_RESPONSE;
-       }
-
-       if (req != NULL) {
-               OCSP_REQUEST_free(req);
-               req = NULL;
-       }
-
-       if (resp != NULL) {
-               OCSP_RESPONSE_free(resp);
-               resp = NULL;
-       }
-
-       if (bs != NULL) {
-               OCSP_BASICRESP_free(bs);
-               bs = NULL;
-       }
-
-       if(trustedStore != NULL) {
-               X509_STORE_free(trustedStore);
-               trustedStore = NULL;
-       }
+    if (port != NULL) {
+        OPENSSL_free(port);
+    }
+
+    if (path != NULL) {
+        OPENSSL_free(path);
+    }
+    host = port = path = NULL;
+
+    if (use_ssl && use_ssl_ctx) {
+        SSL_CTX_free(use_ssl_ctx);
+    }
+    use_ssl_ctx = NULL;
+
+    if (cbio != NULL) {
+        BIO_free_all(cbio);
+    }
+    cbio = NULL;
+
+    if (!resp) {
+        /*BIO_printf(bio_err, "Error querying OCSP responsder\n");*/
+        /* report error */
+        /* free stuff */
+        OCSP_REQUEST_free(req);
+        return CKM_API_OCSP_STATUS_NET_ERROR;
+    }
+
+    i = OCSP_response_status(resp);
+
+    if (i != OCSP_RESPONSE_STATUS_SUCCESSFUL) {
+        /*BIO_printf(out, "Responder Error: %s (%ld)\n",
+          OCSP_response_status_str(i), i); */
+        /* report error */
+        /* free stuff */
+        OCSP_REQUEST_free(req);
+        OCSP_RESPONSE_free(resp);
+        return CKM_API_OCSP_STATUS_REMOTE_ERROR;
+    }
+
+    bs = OCSP_response_get1_basic(resp);
+    if (!bs) {
+        /* BIO_printf(bio_err, "Error parsing response\n");*/
+        /* report error */
+        /* free stuff */
+        OCSP_REQUEST_free(req);
+        OCSP_RESPONSE_free(resp);
+        return CKM_API_OCSP_STATUS_INVALID_RESPONSE;
+    }
+
+    if(systemCerts != NULL) {
+        trustedStore = X509_STORE_new();
+        for(tmpIdx=0; tmpIdx<sk_X509_num(systemCerts); tmpIdx++) {
+            X509_STORE_add_cert(trustedStore, sk_X509_value(systemCerts, tmpIdx));
+        }
+        X509_STORE_add_cert(trustedStore, issuer);
+    }
+
+    int response = OCSP_basic_verify(bs, NULL, trustedStore, 0);
+    if (response <= 0) {
+        OCSP_REQUEST_free(req);
+        OCSP_RESPONSE_free(resp);
+        OCSP_BASICRESP_free(bs);
+        X509_STORE_free(trustedStore);
+        // find the reason of error
+        int err = ERR_get_error();
+        char errStr[100];
+        ERR_error_string(err,errStr);
+        // printf("OCSP_basic_verify fail.error = %s\n", errStr);
+        return CKM_API_OCSP_STATUS_INVALID_RESPONSE;
+    }
+
+    if ((i = OCSP_check_nonce(req, bs)) <= 0) {
+        if (i == -1) {
+            /*BIO_printf(bio_err, "WARNING: no nonce in response\n");*/
+        } else {
+            /*BIO_printf(bio_err, "Nonce Verify error\n");*/
+            /* report error */
+            /* free stuff */
+            OCSP_REQUEST_free(req);
+            OCSP_RESPONSE_free(resp);
+            OCSP_BASICRESP_free(bs);
+            X509_STORE_free(trustedStore);
+            return CKM_API_OCSP_STATUS_INVALID_RESPONSE;
+        }
+    }
+
+    (void)X509_NAME_oneline(X509_get_subject_name(cert), subj_buf, 255);
+    if(!OCSP_resp_find_status(bs, certid, &ocspStatus, &reason,
+          &rev, &thisupd, &nextupd)) {
+        /* report error */
+
+        /* free stuff */
+        OCSP_RESPONSE_free(resp);
+        OCSP_REQUEST_free(req);
+        OCSP_BASICRESP_free(bs);
+        X509_STORE_free(trustedStore);
+
+        return CKM_API_OCSP_STATUS_INVALID_RESPONSE;
+    }
+
+
+    /* Check validity: if invalid write to output BIO so we
+     * know which response this refers to.
+     */
+    if (!OCSP_check_validity(thisupd, nextupd, nsec, maxage)) {
+        /* ERR_print_errors(out); */
+        /* report error */
+
+        /* free stuff */
+        OCSP_REQUEST_free(req);
+        OCSP_RESPONSE_free(resp);
+        OCSP_BASICRESP_free(bs);
+        X509_STORE_free(trustedStore);
+
+        return CKM_API_OCSP_STATUS_INVALID_RESPONSE;
+    }
+
+    if (req != NULL) {
+        OCSP_REQUEST_free(req);
+        req = NULL;
+    }
+
+    if (resp != NULL) {
+        OCSP_RESPONSE_free(resp);
+        resp = NULL;
+    }
+
+    if (bs != NULL) {
+        OCSP_BASICRESP_free(bs);
+        bs = NULL;
+    }
+
+    if(trustedStore != NULL) {
+        X509_STORE_free(trustedStore);
+        trustedStore = NULL;
+    }
 
     switch(ocspStatus) {
-        case V_OCSP_CERTSTATUS_GOOD:
-            return CKM_API_OCSP_STATUS_GOOD;
-        case V_OCSP_CERTSTATUS_REVOKED:
-            return CKM_API_OCSP_STATUS_REVOKED;
-        case V_OCSP_CERTSTATUS_UNKNOWN:
-            return CKM_API_OCSP_STATUS_UNKNOWN;
-        default:
-            LogError("Internal openssl error: Certificate status have value is out of bound.");
-            return CKM_API_OCSP_STATUS_INTERNAL_ERROR;
+    case V_OCSP_CERTSTATUS_GOOD:
+        return CKM_API_OCSP_STATUS_GOOD;
+    case V_OCSP_CERTSTATUS_REVOKED:
+        return CKM_API_OCSP_STATUS_REVOKED;
+    case V_OCSP_CERTSTATUS_UNKNOWN:
+        return CKM_API_OCSP_STATUS_UNKNOWN;
+    default:
+        LogError("Internal openssl error: Certificate status have value is out of bound.");
+        return CKM_API_OCSP_STATUS_INTERNAL_ERROR;
     }
 }
 

diff --git a/src/manager/service/ocsp.h b/src/manager/service/ocsp.h
index 512b7a7..7db5f2d 100644 (file)
--- a/src/manager/service/ocsp.h
+++ b/src/manager/service/ocsp.h
@@ -30,11 +30,11 @@ namespace CKM {
 
 class OCSPModule {
 public:
-       OCSPModule();
-       virtual ~OCSPModule();
+    OCSPModule();
+    virtual ~OCSPModule();
 
-       // all error code from project will be defined in public client api
-       // OK, UNKNOWN, REVOKED, NO_NETWORK, TIMEOUT
+    // all error code from project will be defined in public client api
+    // OK, UNKNOWN, REVOKED, NO_NETWORK, TIMEOUT
     int verify(const CertificateImplVector &certificateChain);
 private:
     int ocsp_verify(X509 *cert, X509 *issuer, STACK_OF(X509) *systemCerts, const std::string &url);
@@ -42,3 +42,4 @@ private:
 };
 
 } // namespace CKM
+