(file) Return to certificate_test.mak CVS log (file) (dir) Up to [Pegasus] / pegasus / mak

Diff for /pegasus/mak/certificate_test.mak between version 1.5 and 1.6

version 1.5, 2007/08/31 17:23:44 version 1.6, 2007/10/23 17:51:18
Line 556 
Line 556 
         $(MKDIRHIER) $(PEGASUS_TEST_CERT_DIR)         $(MKDIRHIER) $(PEGASUS_TEST_CERT_DIR)
         $(RM) $(PEGASUS_CBA_TEST_CA_DATABASE_FILE)         $(RM) $(PEGASUS_CBA_TEST_CA_DATABASE_FILE)
         $(TOUCH) $(PEGASUS_CBA_TEST_CA_DATABASE_FILE)         $(TOUCH) $(PEGASUS_CBA_TEST_CA_DATABASE_FILE)
         $(MAKE) -f TestMakefile createCBATestSSLConfigurationFile          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile \
         $(MAKE) -f TestMakefile createCBATestCertificates              createCBATestSSLConfigurationFile
         $(MAKE) -f TestMakefile registerInvalidCBATestCertificates          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile \
         $(MAKE) -f TestMakefile registerValidCBATestCertificates              createCBATestCertificates
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile \
               registerInvalidCBATestCertificates
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile \
               registerValidCBATestCertificates
  
 ############################################################################### ###############################################################################
 deleteCBATestCertificateFiles: deleteCBATestCertificateFiles:
Line 573 
Line 577 
         cimtrust -r \         cimtrust -r \
             -i $($($(TEST_NAME_SYM)_ISSUER_SYM)_SUBJECT) \             -i $($($(TEST_NAME_SYM)_ISSUER_SYM)_SUBJECT) \
             -n $($(TEST_NAME_SYM)_SERIAL_NO)             -n $($(TEST_NAME_SYM)_SERIAL_NO)
         $(MAKE) -f TestMakefile deleteCBATestCertificateFiles \          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile \
                deleteCBATestCertificateFiles \
              TEST_CERT_NAME=$($(TEST_NAME_SYM))              TEST_CERT_NAME=$($(TEST_NAME_SYM))
  
 ############################################################################### ###############################################################################
Line 589 
Line 594 
 ############################################################################### ###############################################################################
 deleteCBATestCertificates: FORCE deleteCBATestCertificates: FORCE
         $(foreach i, $(PEGASUS_REG_CERT_NAME_SYMBOLS), \         $(foreach i, $(PEGASUS_REG_CERT_NAME_SYMBOLS), \
             $(MAKESH) $(MAKE) -f TestMakefile deleteCBATestCertificate -i \              $(MAKESH) $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile \
                   deleteCBATestCertificate -i \
                 TEST_NAME_SYM=$(i) $(NL))                 TEST_NAME_SYM=$(i) $(NL))
         $(foreach i, $(PEGASUS_NOT_REG_CERT_NAME_SYMBOLS), \         $(foreach i, $(PEGASUS_NOT_REG_CERT_NAME_SYMBOLS), \
             $(MAKESH) $(MAKE) -f TestMakefile deleteCBATestCertificateFiles \              $(MAKESH) $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile \
                   deleteCBATestCertificateFiles \
                 TEST_NAME_SYM=$(i) $(NL))                 TEST_NAME_SYM=$(i) $(NL))
  
 ############################################################################### ###############################################################################
Line 605 
Line 612 
 cleanupCBATestCertificate_CONFIG_OPTIONS = \ cleanupCBATestCertificate_CONFIG_OPTIONS = \
     enableHttpsConnection=true  sslClientVerificationMode=optional     enableHttpsConnection=true  sslClientVerificationMode=optional
 cleanupCBATestCertificate_TESTSUITE_CMDS = \ cleanupCBATestCertificate_TESTSUITE_CMDS = \
        $(MAKE)@@-f@@TestMakefile@@deleteCBATestCertificates         $(MAKE)@@--directory=$(PEGASUS_ROOT)@@-f@@TestMakefile@@deleteCBATestCertificates
  
 cleanupCBATestCertificates: FORCE cleanupCBATestCertificates: FORCE
         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile runTestSuite \
         CIMSERVER_CONFIG_OPTIONS="$(cleanupCBATestCertificate_CONFIG_OPTIONS)" \         CIMSERVER_CONFIG_OPTIONS="$(cleanupCBATestCertificate_CONFIG_OPTIONS)" \
         TESTSUITE_CMDS="$(cleanupCBATestCertificate_TESTSUITE_CMDS)"         TESTSUITE_CMDS="$(cleanupCBATestCertificate_TESTSUITE_CMDS)"
         $(RM) $(PEGASUS_CBA_TEST_CA_DATABASE_FILE)         $(RM) $(PEGASUS_CBA_TEST_CA_DATABASE_FILE)
Line 627 
Line 634 
 # #
 ############################################################################### ###############################################################################
 runCBATestSuites: FORCE runCBATestSuites: FORCE
         $(MAKE) -f TestMakefile runCBATestConfiguration1          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile runCBATestConfiguration1
         $(MAKE) -f TestMakefile runCBATestConfiguration2          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile runCBATestConfiguration2
         $(MAKE) -f TestMakefile runCBATestConfiguration3          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile runCBATestConfiguration3
  
 ############################################################################### ###############################################################################
 #  The displayTestCerticate option uses the "openssl x509" command line tool #  The displayTestCerticate option uses the "openssl x509" command line tool
Line 654 
Line 661 
 ############################################################################### ###############################################################################
 displayCBATestCertificates: FORCE displayCBATestCertificates: FORCE
         @$(foreach i, $(PEGASUS_CERT_NAME_SYMBOLS), \         @$(foreach i, $(PEGASUS_CERT_NAME_SYMBOLS), \
             $(MAKESH) $(MAKE) -f TestMakefile displayCBATestCertificate \              $(MAKESH) $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile \
                 TEST_CERT_NAME=$($(i)) $(NL))                  displayCBATestCertificate TEST_CERT_NAME=$($(i)) $(NL))
  
 registerInvalidCBATestCertificates: registerInvalidCBATestCertificates:
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
         $(foreach i, $(PEGASUS_NOT_VALIDATED_REG_CERT_NAME_SYMBOLS), \         $(foreach i, $(PEGASUS_NOT_VALIDATED_REG_CERT_NAME_SYMBOLS), \
             $(MAKESH) $(MAKE) -f TestMakefile \              $(MAKESH) $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile \
                 registerInvalidCBATestCertificate \                 registerInvalidCBATestCertificate \
                 TEST_NAME_SYM=$(i) \                 TEST_NAME_SYM=$(i) \
                 TEST_CERT_EXPIRED=$($(i)_EXPIRED) \                 TEST_CERT_EXPIRED=$($(i)_EXPIRED) \
Line 767 
Line 774 
             -in $(PEGASUS_TEST_CERT_DIR)/$($(TEST_NAME_SYM)).csr \             -in $(PEGASUS_TEST_CERT_DIR)/$($(TEST_NAME_SYM)).csr \
             -req -signkey $(PEGASUS_TEST_CERT_DIR)/$($(TEST_NAME_SYM)).key \             -req -signkey $(PEGASUS_TEST_CERT_DIR)/$($(TEST_NAME_SYM)).key \
             -out $(PEGASUS_TEST_CERT_DIR)/$($(TEST_NAME_SYM)).cert             -out $(PEGASUS_TEST_CERT_DIR)/$($(TEST_NAME_SYM)).cert
         $(MAKE) -f TestMakefile signCBATestCertificate \          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile \
               signCBATestCertificate \
             TEST_CERT_NAME=$($(TEST_NAME_SYM)) \             TEST_CERT_NAME=$($(TEST_NAME_SYM)) \
             TEST_CERT_ISSUER_SYM=$($(TEST_NAME_SYM)_ISSUER_SYM) \             TEST_CERT_ISSUER_SYM=$($(TEST_NAME_SYM)_ISSUER_SYM) \
             TEST_CERT_EXPIRED=$($(TEST_NAME_SYM)_EXPIRED) \             TEST_CERT_EXPIRED=$($(TEST_NAME_SYM)_EXPIRED) \
             TEST_CERT_IN_TS=$($(TEST_NAME_SYM)_IN_TS)             TEST_CERT_IN_TS=$($(TEST_NAME_SYM)_IN_TS)
  
 createSelfSignedCACBATestCertificate: createSelfSignedCACBATestCertificate:
         $(MAKE) -f TestMakefile createSelfSignedCBATestCertificate \          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile \
               createSelfSignedCBATestCertificate \
             TEST_NAME_SYM=$(TEST_NAME_SYM) \             TEST_NAME_SYM=$(TEST_NAME_SYM) \
             TEST_CERT_SET_SERIAL=$(TEST_NAME_SYM)             TEST_CERT_SET_SERIAL=$(TEST_NAME_SYM)
  
Line 799 
Line 808 
           -CAkey \           -CAkey \
              $(PEGASUS_TEST_CERT_DIR)/$($($(TEST_NAME_SYM)_ISSUER_SYM)).key \              $(PEGASUS_TEST_CERT_DIR)/$($($(TEST_NAME_SYM)_ISSUER_SYM)).key \
           -out $(PEGASUS_TEST_CERT_DIR)/$($(TEST_NAME_SYM)).cert           -out $(PEGASUS_TEST_CERT_DIR)/$($(TEST_NAME_SYM)).cert
         $(MAKE) -f TestMakefile signCBATestCertificate \          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile \
               signCBATestCertificate \
             TEST_CERT_NAME=$($(TEST_NAME_SYM)) \             TEST_CERT_NAME=$($(TEST_NAME_SYM)) \
             TEST_CERT_ISSUER_SYM=$($(TEST_NAME_SYM)_ISSUER_SYM) \             TEST_CERT_ISSUER_SYM=$($(TEST_NAME_SYM)_ISSUER_SYM) \
             TEST_CERT_EXPIRED=$($(TEST_NAME_SYM)_EXPIRED) \             TEST_CERT_EXPIRED=$($(TEST_NAME_SYM)_EXPIRED) \
Line 821 
Line 831 
     enableHttpsConnection=true sslClientVerificationMode=optional \     enableHttpsConnection=true sslClientVerificationMode=optional \
     enableAuthentication=true     enableAuthentication=true
 registerValidCBATestCertificates_TESTSUITE_CMDS = \ registerValidCBATestCertificates_TESTSUITE_CMDS = \
        $(MAKE)@@-f@@TestMakefile@@internal_RegisterValidCBATestCertificates         $(MAKE)@@--directory=$(PEGASUS_ROOT)@@-f@@TestMakefile@@internal_RegisterValidCBATestCertificates
  
 registerValidCBATestCertificates: FORCE registerValidCBATestCertificates: FORCE
         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile runTestSuite \
             CIMSERVER_CONFIG_OPTIONS= \             CIMSERVER_CONFIG_OPTIONS= \
                 "$(registerValidCBATestCertificates_CONFIG_OPTIONS)" \                 "$(registerValidCBATestCertificates_CONFIG_OPTIONS)" \
             TESTSUITE_CMDS="$(registerValidCBATestCertificates_TESTSUITE_CMDS)"             TESTSUITE_CMDS="$(registerValidCBATestCertificates_TESTSUITE_CMDS)"
  
 internal_RegisterValidCBATestCertificates: internal_RegisterValidCBATestCertificates:
         $(foreach i, $(PEGASUS_VALIDATED_REG_CERT_NAME_SYMBOLS), \         $(foreach i, $(PEGASUS_VALIDATED_REG_CERT_NAME_SYMBOLS), \
             $(MAKESH) $(MAKE) -f TestMakefile registerCBATestCertificate \              $(MAKESH) $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile \
                   registerCBATestCertificate \
                 TEST_CERT_NAME=$($(i)) \                 TEST_CERT_NAME=$($(i)) \
                 TEST_CERT_TYPE=$($(i)_TYPE) \                 TEST_CERT_TYPE=$($(i)_TYPE) \
                 TEST_CERT_USER=$($(i)_USER_NAME) $(NL))                 TEST_CERT_USER=$($(i)_USER_NAME) $(NL))
Line 846 
Line 857 
 createCBATestCertificates: createCBATestCertificates:
 ifeq ($(OPENSSL_SET_SERIAL_SUPPORTED),true) ifeq ($(OPENSSL_SET_SERIAL_SUPPORTED),true)
         $(foreach i, $(PEGASUS_SCERT_NAME_SYMBOLS), \         $(foreach i, $(PEGASUS_SCERT_NAME_SYMBOLS), \
             $(MAKESH) $(MAKE) -f TestMakefile \              $(MAKESH) $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile \
                 createSelfSignedCBATestCertificate \                 createSelfSignedCBATestCertificate \
                 TEST_NAME_SYM=$(i) \                 TEST_NAME_SYM=$(i) \
                 TEST_CERT_SET_SERIAL="-set_serial $($(i)_SERIAL_NO)" $(NL))                 TEST_CERT_SET_SERIAL="-set_serial $($(i)_SERIAL_NO)" $(NL))
         $(foreach i, $(PEGASUS_RACERT_NAME_SYMBOLS), \         $(foreach i, $(PEGASUS_RACERT_NAME_SYMBOLS), \
             $(MAKESH) $(MAKE) -f TestMakefile \              $(MAKESH) $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile \
                 createSelfSignedCACBATestCertificate \                 createSelfSignedCACBATestCertificate \
                 TEST_NAME_SYM=$(i) \                 TEST_NAME_SYM=$(i) \
                 TEST_CERT_SET_SERIAL="-set_serial $($(i)_SERIAL_NO)" $(NL))                 TEST_CERT_SET_SERIAL="-set_serial $($(i)_SERIAL_NO)" $(NL))
         $(foreach i, $(PEGASUS_ECERT_NAME_SYMBOLS), \         $(foreach i, $(PEGASUS_ECERT_NAME_SYMBOLS), \
             $(MAKESH) $(MAKE) -f TestMakefile \              $(MAKESH) $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile \
                 createCASignedCBATestCertificate \                 createCASignedCBATestCertificate \
                 TEST_NAME_SYM=$(i) \                 TEST_NAME_SYM=$(i) \
                 TEST_CERT_SET_SERIAL="-set_serial $($(i)_SERIAL_NO)" $(NL))                 TEST_CERT_SET_SERIAL="-set_serial $($(i)_SERIAL_NO)" $(NL))
 else else
         $(foreach i, $(PEGASUS_SCERT_NAME_SYMBOLS), \         $(foreach i, $(PEGASUS_SCERT_NAME_SYMBOLS), \
             $(MAKESH) $(MAKE) -f TestMakefile \              $(MAKESH) $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile \
                 createSelfSignedCBATestCertificate \                 createSelfSignedCBATestCertificate \
                 TEST_NAME_SYM=$(i) $(NL))                 TEST_NAME_SYM=$(i) $(NL))
         $(foreach i, $(PEGASUS_RACERT_NAME_SYMBOLS), \         $(foreach i, $(PEGASUS_RACERT_NAME_SYMBOLS), \
             $(MAKESH) $(MAKE) -f TestMakefile \              $(MAKESH) $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile \
                 createSelfSignedCACBATestCertificate \                 createSelfSignedCACBATestCertificate \
                 TEST_NAME_SYM=$(i) $(NL))                 TEST_NAME_SYM=$(i) $(NL))
         $(foreach i, $(PEGASUS_ECERT_NAME_SYMBOLS), \         $(foreach i, $(PEGASUS_ECERT_NAME_SYMBOLS), \
             $(MAKESH) $(MAKE) -f TestMakefile \              $(MAKESH) $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile \
                 createCASignedCBATestCertificate \                 createCASignedCBATestCertificate \
                 TEST_NAME_SYM=$(i) $(NL))                 TEST_NAME_SYM=$(i) $(NL))
 endif endif
Line 891 
Line 902 
        enableHttpsConnection=true sslClientVerificationMode=disabled \        enableHttpsConnection=true sslClientVerificationMode=disabled \
        enableAuthentication=true        enableAuthentication=true
 runCBATestConfiguration1_TESTSUITE_CMDS = \ runCBATestConfiguration1_TESTSUITE_CMDS = \
        $(MAKE)@@-f@@TestMakefile@@internal_runCBATestConfiguration1         $(MAKE)@@--directory=$(PEGASUS_ROOT)@@-f@@TestMakefile@@internal_runCBATestConfiguration1
  
 runCBATestConfiguration1: FORCE runCBATestConfiguration1: FORCE
         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile runTestSuite \
          CIMSERVER_CONFIG_OPTIONS="$(runCBATestConfiguration1_CONFIG_OPTIONS)" \          CIMSERVER_CONFIG_OPTIONS="$(runCBATestConfiguration1_CONFIG_OPTIONS)" \
          TESTSUITE_CMDS="$(runCBATestConfiguration1_TESTSUITE_CMDS)"          TESTSUITE_CMDS="$(runCBATestConfiguration1_TESTSUITE_CMDS)"
  
Line 1375 
Line 1386 
       enableHttpsConnection=true sslClientVerificationMode=optional \       enableHttpsConnection=true sslClientVerificationMode=optional \
       enableAuthentication=true       enableAuthentication=true
 runCBATestConfiguration2_TESTSUITE_CMDS = \ runCBATestConfiguration2_TESTSUITE_CMDS = \
       $(MAKE)@@-f@@TestMakefile@@internal_runCBATestConfiguration$(configurationType)        $(MAKE)@@--directory=$(PEGASUS_ROOT)@@-f@@TestMakefile@@internal_runCBATestConfiguration$(configurationType)
  
 runCBATestConfiguration2: FORCE runCBATestConfiguration2: FORCE
         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile runTestSuite \
          CIMSERVER_CONFIG_OPTIONS="$(runCBATestConfiguration2_CONFIG_OPTIONS)" \          CIMSERVER_CONFIG_OPTIONS="$(runCBATestConfiguration2_CONFIG_OPTIONS)" \
          TESTSUITE_CMDS="$(runCBATestConfiguration2_TESTSUITE_CMDS)"          TESTSUITE_CMDS="$(runCBATestConfiguration2_TESTSUITE_CMDS)"
  
Line 2318 
Line 2329 
        enableHttpsConnection=true sslClientVerificationMode=required \        enableHttpsConnection=true sslClientVerificationMode=required \
        enableAuthentication=true        enableAuthentication=true
 runCBATestConfiguration3_TESTSUITE_CMDS = \ runCBATestConfiguration3_TESTSUITE_CMDS = \
        $(MAKE)@@-f@@TestMakefile@@internal_runCBATestConfiguration3         $(MAKE)@@--directory=$(PEGASUS_ROOT)@@-f@@TestMakefile@@internal_runCBATestConfiguration3
  
 runCBATestConfiguration3: FORCE runCBATestConfiguration3: FORCE
         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile runTestSuite \
          CIMSERVER_CONFIG_OPTIONS="$(runCBATestConfiguration3_CONFIG_OPTIONS)" \          CIMSERVER_CONFIG_OPTIONS="$(runCBATestConfiguration3_CONFIG_OPTIONS)" \
          TESTSUITE_CMDS="$(runCBATestConfiguration3_TESTSUITE_CMDS)"          TESTSUITE_CMDS="$(runCBATestConfiguration3_TESTSUITE_CMDS)"
  

Legend:
Removed from v.1.5  
changed lines
  Added in v.1.6
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2