(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.2 and 1.6

version 1.2, 2006/07/19 16:16:15 version 1.6, 2007/10/23 17:51:18
Line 150 
Line 150 
 PEGASUS_SCERT_NOTTS_NO_USR_SERIAL_NO = 50010 PEGASUS_SCERT_NOTTS_NO_USR_SERIAL_NO = 50010
 PEGASUS_SCERT_NOTTS_NO_USR_SERIAL_NO_HEX = C35A PEGASUS_SCERT_NOTTS_NO_USR_SERIAL_NO_HEX = C35A
 PEGASUS_SCERT_NOTTS_NO_USR_EXPIRED = NO PEGASUS_SCERT_NOTTS_NO_USR_EXPIRED = NO
   PEGASUS_SCERT_NOTTS_NO_USR_TYPE = s
 PEGASUS_SCERT_NOTTS_NO_USR_IN_TS = NO PEGASUS_SCERT_NOTTS_NO_USR_IN_TS = NO
  
 # ID = 40: Define PEGASUS_SCERT_IN_TS_NO_USR # ID = 40: Define PEGASUS_SCERT_IN_TS_NO_USR
Line 161 
Line 162 
 PEGASUS_SCERT_IN_TS_NO_USR_SERIAL_NO = 50040 PEGASUS_SCERT_IN_TS_NO_USR_SERIAL_NO = 50040
 PEGASUS_SCERT_IN_TS_NO_USR_SERIAL_NO_HEX = C378 PEGASUS_SCERT_IN_TS_NO_USR_SERIAL_NO_HEX = C378
 PEGASUS_SCERT_IN_TS_NO_USR_USER_NAME = PEGASUS_SCERT_IN_TS_NO_USR_USER_NAME =
   PEGASUS_SCERT_IN_TS_NO_USR_HASH_NAME = \
       $(shell $(OPENSSL_COMMAND) x509 -hash -noout \
       -in $(PEGASUS_TEST_CERT_DIR)/$(PEGASUS_SCERT_IN_TS_NO_USR).cert).0
 PEGASUS_SCERT_IN_TS_NO_USR_EXPIRED = NO PEGASUS_SCERT_IN_TS_NO_USR_EXPIRED = NO
   PEGASUS_SCERT_IN_TS_NO_USR_TYPE = s
 PEGASUS_SCERT_IN_TS_NO_USR_IN_TS = YES PEGASUS_SCERT_IN_TS_NO_USR_IN_TS = YES
  
 # ID = 50: Define PEGASUS_SCERT_IN_TS_VLD_USR # ID = 50: Define PEGASUS_SCERT_IN_TS_VLD_USR
Line 174 
Line 179 
 PEGASUS_SCERT_IN_TS_VLD_USR_SERIAL_NO_HEX = C382 PEGASUS_SCERT_IN_TS_VLD_USR_SERIAL_NO_HEX = C382
 PEGASUS_SCERT_IN_TS_VLD_USR_USER_NAME = $(PEGASUS_TEST_CERT_USER_ID) PEGASUS_SCERT_IN_TS_VLD_USR_USER_NAME = $(PEGASUS_TEST_CERT_USER_ID)
 PEGASUS_SCERT_IN_TS_VLD_USR_EXPIRED = NO PEGASUS_SCERT_IN_TS_VLD_USR_EXPIRED = NO
   PEGASUS_SCERT_IN_TS_VLD_USR_TYPE = s
 PEGASUS_SCERT_IN_TS_VLD_USR_IN_TS = YES PEGASUS_SCERT_IN_TS_VLD_USR_IN_TS = YES
  
 # ID = 60: Define PEGASUS_SCERT_IN_TS_INVLD_USR # ID = 60: Define PEGASUS_SCERT_IN_TS_INVLD_USR
Line 190 
Line 196 
     $(shell $(OPENSSL_COMMAND) x509 -hash -noout \     $(shell $(OPENSSL_COMMAND) x509 -hash -noout \
     -in $(PEGASUS_TEST_CERT_DIR)/$(PEGASUS_SCERT_IN_TS_INVLD_USR).cert).0     -in $(PEGASUS_TEST_CERT_DIR)/$(PEGASUS_SCERT_IN_TS_INVLD_USR).cert).0
 PEGASUS_SCERT_IN_TS_INVLD_USR_EXPIRED = NO PEGASUS_SCERT_IN_TS_INVLD_USR_EXPIRED = NO
   PEGASUS_SCERT_IN_TS_INVLD_USR_TYPE = s
 PEGASUS_SCERT_IN_TS_INVLD_USR_IN_TS = YES PEGASUS_SCERT_IN_TS_INVLD_USR_IN_TS = YES
  
 # ID = 070: Define PEGASUS_EXP_SCERT_NOTTS_NO_USR # ID = 070: Define PEGASUS_EXP_SCERT_NOTTS_NO_USR
Line 205 
Line 212 
     $(shell $(OPENSSL_COMMAND) x509 -hash -noout \     $(shell $(OPENSSL_COMMAND) x509 -hash -noout \
     -in $(PEGASUS_TEST_CERT_DIR)/$(PEGASUS_EXP_SCERT_NOTTS_NO_USR).cert).0     -in $(PEGASUS_TEST_CERT_DIR)/$(PEGASUS_EXP_SCERT_NOTTS_NO_USR).cert).0
 PEGASUS_EXP_SCERT_NOTTS_NO_USR_EXPIRED = YES PEGASUS_EXP_SCERT_NOTTS_NO_USR_EXPIRED = YES
   PEGASUS_EXP_SCERT_NOTTS_NO_USR_TYPE = s
 PEGASUS_EXP_SCERT_NOTTS_NO_USR_IN_TS = NO PEGASUS_EXP_SCERT_NOTTS_NO_USR_IN_TS = NO
  
 # ID = 100: Define PEGASUS_EXP_SCERT_IN_TS_NO_USR # ID = 100: Define PEGASUS_EXP_SCERT_IN_TS_NO_USR
Line 220 
Line 228 
     $(shell $(OPENSSL_COMMAND) x509 -hash -noout \     $(shell $(OPENSSL_COMMAND) x509 -hash -noout \
     -in $(PEGASUS_TEST_CERT_DIR)/$(PEGASUS_EXP_SCERT_IN_TS_NO_USR).cert).0     -in $(PEGASUS_TEST_CERT_DIR)/$(PEGASUS_EXP_SCERT_IN_TS_NO_USR).cert).0
 PEGASUS_EXP_SCERT_IN_TS_NO_USR_EXPIRED = YES PEGASUS_EXP_SCERT_IN_TS_NO_USR_EXPIRED = YES
   PEGASUS_EXP_SCERT_IN_TS_NO_USR_TYPE = s
 PEGASUS_EXP_SCERT_IN_TS_NO_USR_IN_TS = YES PEGASUS_EXP_SCERT_IN_TS_NO_USR_IN_TS = YES
  
 # ID = 110 : Define PEGASUS_EXP_SCERT_IN_TS_VLD_USR # ID = 110 : Define PEGASUS_EXP_SCERT_IN_TS_VLD_USR
Line 235 
Line 244 
     $(shell $(OPENSSL_COMMAND) x509 -hash -noout \     $(shell $(OPENSSL_COMMAND) x509 -hash -noout \
     -in $(PEGASUS_TEST_CERT_DIR)/$(PEGASUS_EXP_SCERT_IN_TS_VLD_USR).cert).0     -in $(PEGASUS_TEST_CERT_DIR)/$(PEGASUS_EXP_SCERT_IN_TS_VLD_USR).cert).0
 PEGASUS_EXP_SCERT_IN_TS_VLD_USR_EXPIRED = YES PEGASUS_EXP_SCERT_IN_TS_VLD_USR_EXPIRED = YES
   PEGASUS_EXP_SCERT_IN_TS_VLD_USR_TYPE = s
 PEGASUS_EXP_SCERT_IN_TS_VLD_USR_IN_TS = YES PEGASUS_EXP_SCERT_IN_TS_VLD_USR_IN_TS = YES
  
 # ID = 120: Define PEGASUS_EXP_SCERT_IN_TS_INVLD_USR # ID = 120: Define PEGASUS_EXP_SCERT_IN_TS_INVLD_USR
Line 251 
Line 261 
     $(shell $(OPENSSL_COMMAND) x509 -hash -noout \     $(shell $(OPENSSL_COMMAND) x509 -hash -noout \
     -in $(PEGASUS_TEST_CERT_DIR)/$(PEGASUS_EXP_SCERT_IN_TS_INVLD_USR).cert).0     -in $(PEGASUS_TEST_CERT_DIR)/$(PEGASUS_EXP_SCERT_IN_TS_INVLD_USR).cert).0
 PEGASUS_EXP_SCERT_IN_TS_INVLD_USR_EXPIRED = YES PEGASUS_EXP_SCERT_IN_TS_INVLD_USR_EXPIRED = YES
   PEGASUS_EXP_SCERT_IN_TS_INVLD_USR_TYPE = s
 PEGASUS_EXP_SCERT_IN_TS_INVLD_USR_IN_TS = YES PEGASUS_EXP_SCERT_IN_TS_INVLD_USR_IN_TS = YES
  
 # ID = 240: Define PEGASUS_RACERT_IN_TS_NO_USR # ID = 240: Define PEGASUS_RACERT_IN_TS_NO_USR
Line 263 
Line 274 
 PEGASUS_RACERT_IN_TS_NO_USR_SERIAL_NO_HEX = C440 PEGASUS_RACERT_IN_TS_NO_USR_SERIAL_NO_HEX = C440
 PEGASUS_RACERT_IN_TS_NO_USR_USER_NAME = PEGASUS_RACERT_IN_TS_NO_USR_USER_NAME =
 PEGASUS_RACERT_IN_TS_NO_USR_EXPIRED = NO PEGASUS_RACERT_IN_TS_NO_USR_EXPIRED = NO
   PEGASUS_RACERT_IN_TS_NO_USR_TYPE = a
 PEGASUS_RACERT_IN_TS_NO_USR_IN_TS = YES PEGASUS_RACERT_IN_TS_NO_USR_IN_TS = YES
  
 # ID = 610: Define PEGASUS_ECERT_NOTTS_NO_USR_RA0240 # ID = 610: Define PEGASUS_ECERT_NOTTS_NO_USR_RA0240
Line 275 
Line 287 
 PEGASUS_ECERT_NOTTS_NO_USR_RA0240_SERIAL_NO_HEX = C5B2 PEGASUS_ECERT_NOTTS_NO_USR_RA0240_SERIAL_NO_HEX = C5B2
 PEGASUS_ECERT_NOTTS_NO_USR_RA0240_ISSUER_SYM = PEGASUS_RACERT_IN_TS_NO_USR PEGASUS_ECERT_NOTTS_NO_USR_RA0240_ISSUER_SYM = PEGASUS_RACERT_IN_TS_NO_USR
 PEGASUS_ECERT_NOTTS_NO_USR_RA0240_EXPIRED = NO PEGASUS_ECERT_NOTTS_NO_USR_RA0240_EXPIRED = NO
   PEGASUS_ECERT_NOTTS_NO_USR_RA0240_TYPE = e
 PEGASUS_ECERT_NOTTS_NO_USR_RA0240_IN_TS = NO PEGASUS_ECERT_NOTTS_NO_USR_RA0240_IN_TS = NO
  
 # ID = 620: Define PEGASUS_ECERT_NOTTS_VLD_USR_RA0240 # ID = 620: Define PEGASUS_ECERT_NOTTS_VLD_USR_RA0240
Line 289 
Line 302 
    $(PEGASUS_TEST_CERT_USER_ID)    $(PEGASUS_TEST_CERT_USER_ID)
 PEGASUS_ECERT_NOTTS_VLD_USR_RA0240_ISSUER_SYM = PEGASUS_RACERT_IN_TS_NO_USR PEGASUS_ECERT_NOTTS_VLD_USR_RA0240_ISSUER_SYM = PEGASUS_RACERT_IN_TS_NO_USR
 PEGASUS_ECERT_NOTTS_VLD_USR_RA0240_EXPIRED = NO PEGASUS_ECERT_NOTTS_VLD_USR_RA0240_EXPIRED = NO
   PEGASUS_ECERT_NOTTS_VLD_USR_RA0240_TYPE = e
 PEGASUS_ECERT_NOTTS_VLD_USR_RA0240_IN_TS = NO PEGASUS_ECERT_NOTTS_VLD_USR_RA0240_IN_TS = NO
 PEGASUS_ECERT_NOTTS_VLD_USR_RA0240_HASH_NAME = \ PEGASUS_ECERT_NOTTS_VLD_USR_RA0240_HASH_NAME = \
     $(shell $(OPENSSL_COMMAND) x509 -hash -noout \     $(shell $(OPENSSL_COMMAND) x509 -hash -noout \
Line 309 
Line 323 
     -in $(PEGASUS_TEST_CERT_DIR)/$(PEGASUS_ECERT_NOTTS_INVLD_USR_RA0240).cert).0     -in $(PEGASUS_TEST_CERT_DIR)/$(PEGASUS_ECERT_NOTTS_INVLD_USR_RA0240).cert).0
 PEGASUS_ECERT_NOTTS_INVLD_USR_RA0240_ISSUER_SYM = PEGASUS_RACERT_IN_TS_NO_USR PEGASUS_ECERT_NOTTS_INVLD_USR_RA0240_ISSUER_SYM = PEGASUS_RACERT_IN_TS_NO_USR
 PEGASUS_ECERT_NOTTS_INVLD_USR_RA0240_EXPIRED = NO PEGASUS_ECERT_NOTTS_INVLD_USR_RA0240_EXPIRED = NO
   PEGASUS_ECERT_NOTTS_INVLD_USR_RA0240_TYPE = e
 PEGASUS_ECERT_NOTTS_INVLD_USR_RA0240_IN_TS = NO PEGASUS_ECERT_NOTTS_INVLD_USR_RA0240_IN_TS = NO
  
 # ID = 670: Define PEGASUS_EXP_ECERT_NOTTS_NO_USR_RA0240 # ID = 670: Define PEGASUS_EXP_ECERT_NOTTS_NO_USR_RA0240
Line 321 
Line 336 
 PEGASUS_EXP_ECERT_NOTTS_NO_USR_RA0240_SERIAL_NO_HEX = C5EE PEGASUS_EXP_ECERT_NOTTS_NO_USR_RA0240_SERIAL_NO_HEX = C5EE
 PEGASUS_EXP_ECERT_NOTTS_NO_USR_RA0240_ISSUER_SYM = PEGASUS_RACERT_IN_TS_NO_USR PEGASUS_EXP_ECERT_NOTTS_NO_USR_RA0240_ISSUER_SYM = PEGASUS_RACERT_IN_TS_NO_USR
 PEGASUS_EXP_ECERT_NOTTS_NO_USR_RA0240_EXPIRED = YES PEGASUS_EXP_ECERT_NOTTS_NO_USR_RA0240_EXPIRED = YES
   PEGASUS_EXP_ECERT_NOTTS_NO_USR_RA0240_TYPE = e
 PEGASUS_EXP_ECERT_NOTTS_NO_USR_RA0240_IN_TS = NO PEGASUS_EXP_ECERT_NOTTS_NO_USR_RA0240_IN_TS = NO
  
 # ID = 680: Define PEGASUS_EXP_ECERT_NOTTS_VLD_USR_RA0240 # ID = 680: Define PEGASUS_EXP_ECERT_NOTTS_VLD_USR_RA0240
Line 335 
Line 351 
    $(PEGASUS_TEST_CERT_USER_ID)    $(PEGASUS_TEST_CERT_USER_ID)
 PEGASUS_EXP_ECERT_NOTTS_VLD_USR_RA0240_ISSUER_SYM = PEGASUS_RACERT_IN_TS_NO_USR PEGASUS_EXP_ECERT_NOTTS_VLD_USR_RA0240_ISSUER_SYM = PEGASUS_RACERT_IN_TS_NO_USR
 PEGASUS_EXP_ECERT_NOTTS_VLD_USR_RA0240_EXPIRED = YES PEGASUS_EXP_ECERT_NOTTS_VLD_USR_RA0240_EXPIRED = YES
   PEGASUS_EXP_ECERT_NOTTS_VLD_USR_RA0240_TYPE = e
 PEGASUS_EXP_ECERT_NOTTS_VLD_USR_RA0240_IN_TS = NO PEGASUS_EXP_ECERT_NOTTS_VLD_USR_RA0240_IN_TS = NO
 PEGASUS_EXP_ECERT_NOTTS_VLD_USR_RA0240_HASH_NAME = \ PEGASUS_EXP_ECERT_NOTTS_VLD_USR_RA0240_HASH_NAME = \
     $(shell $(OPENSSL_COMMAND) x509 -hash -noout -in \     $(shell $(OPENSSL_COMMAND) x509 -hash -noout -in \
Line 356 
Line 373 
 PEGASUS_EXP_ECERT_NOTTS_INVLD_USR_RA0240_ISSUER_SYM = \ PEGASUS_EXP_ECERT_NOTTS_INVLD_USR_RA0240_ISSUER_SYM = \
      PEGASUS_RACERT_IN_TS_NO_USR      PEGASUS_RACERT_IN_TS_NO_USR
 PEGASUS_EXP_ECERT_NOTTS_INVLD_USR_RA0240_EXPIRED = YES PEGASUS_EXP_ECERT_NOTTS_INVLD_USR_RA0240_EXPIRED = YES
   PEGASUS_EXP_ECERT_NOTTS_INVLD_USR_RA0240_TYPE = e
 PEGASUS_EXP_ECERT_NOTTS_INVLD_USR_RA0240_IN_TS = NO PEGASUS_EXP_ECERT_NOTTS_INVLD_USR_RA0240_IN_TS = NO
  
 ############################################################################### ###############################################################################
Line 366 
Line 384 
 # one of the following three groups: # one of the following three groups:
 # #
 #  PEGASUS_VALIDATED_REG_XXXX certificates are valid certificates that can #  PEGASUS_VALIDATED_REG_XXXX certificates are valid certificates that can
 #  be successfully registered using the ssltrustmgr command.  #  be successfully registered using the cimtrust command.
 #    PEGASUS_VALIDATED_REG_SCERT_NAME_SYMBOLS #    PEGASUS_VALIDATED_REG_SCERT_NAME_SYMBOLS
 #    PEGASUS_VALIDATED_REG_RACERT_NAME_SYMBOLS #    PEGASUS_VALIDATED_REG_RACERT_NAME_SYMBOLS
 #    PEGASUS_VALIDATED_REG_IACERT_NAME_SYMBOLS #    PEGASUS_VALIDATED_REG_IACERT_NAME_SYMBOLS
 #    PEGASUS_VALDIATED_REG_ECERT_NAME_SYMBOLS #    PEGASUS_VALDIATED_REG_ECERT_NAME_SYMBOLS
 # #
 #  PEGASUS_NOT_VALIDATED_REG_XXXX certificates are certificates that can #  PEGASUS_NOT_VALIDATED_REG_XXXX certificates are certificates that can
 #  NOT be registered using the ssltrustmgr command. To bypass the validity  #  NOT be registered using the cimtrust command. To bypass the validity
 #  tests performed by the Certificate Provider, the cimmofl command will #  tests performed by the Certificate Provider, the cimmofl command will
 #  be used to register these certificates. #  be used to register these certificates.
 #    PEGASUS_NOT_VALIDATED_REG_SCERT_NAME_SYMBOLS #    PEGASUS_NOT_VALIDATED_REG_SCERT_NAME_SYMBOLS
Line 386 
Line 404 
 ############################################################################### ###############################################################################
  
 PEGASUS_VALIDATED_REG_SCERT_NAME_SYMBOLS = \ PEGASUS_VALIDATED_REG_SCERT_NAME_SYMBOLS = \
    PEGASUS_SCERT_IN_TS_VLD_USR \     PEGASUS_SCERT_IN_TS_VLD_USR
    PEGASUS_SCERT_IN_TS_NO_USR  
  
 PEGASUS_VALIDATED_REG_RACERT_NAME_SYMBOLS = \ PEGASUS_VALIDATED_REG_RACERT_NAME_SYMBOLS = \
    PEGASUS_RACERT_IN_TS_NO_USR    PEGASUS_RACERT_IN_TS_NO_USR
Line 404 
Line 421 
  
 PEGASUS_NOT_VALIDATED_REG_SCERT_NAME_SYMBOLS = \ PEGASUS_NOT_VALIDATED_REG_SCERT_NAME_SYMBOLS = \
    PEGASUS_SCERT_IN_TS_INVLD_USR \    PEGASUS_SCERT_IN_TS_INVLD_USR \
      PEGASUS_SCERT_IN_TS_NO_USR \
    PEGASUS_EXP_SCERT_NOTTS_NO_USR \    PEGASUS_EXP_SCERT_NOTTS_NO_USR \
    PEGASUS_EXP_SCERT_IN_TS_NO_USR \    PEGASUS_EXP_SCERT_IN_TS_NO_USR \
    PEGASUS_EXP_SCERT_IN_TS_VLD_USR \    PEGASUS_EXP_SCERT_IN_TS_VLD_USR \
Line 538 
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 552 
Line 574 
         $(RM) $(PEGASUS_TEST_CERT_DIR)/$($(TEST_NAME_SYM)_SERIAL_NO_HEX).pem         $(RM) $(PEGASUS_TEST_CERT_DIR)/$($(TEST_NAME_SYM)_SERIAL_NO_HEX).pem
  
 deleteCBATestCertificate: deleteCBATestCertificate:
         ssltrustmgr -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))
  
 ############################################################################### ###############################################################################
 #  The deleteCBATestCertificates option removes the registered certificates #  The deleteCBATestCertificates option removes the registered certificates
 #  from the truststore using the ssltrustmgr command.  In addition, it  #  from the truststore using the cimtrust command.  In addition, it
 #  removes any created certificate files from the $(PEGASUS_TEST_CERT_DIR) #  removes any created certificate files from the $(PEGASUS_TEST_CERT_DIR)
 #  directory. #  directory.
 # #
Line 571 
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 587 
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 609 
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 636 
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:
         -$(CIMSERVER_STOP_SERVICE)          $(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 749 
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 781 
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 789 
Line 817 
  
 registerCBATestCertificate: registerCBATestCertificate:
 ifdef TEST_CERT_USER ifdef TEST_CERT_USER
         ssltrustmgr -a \          cimtrust -a \
             -f $(PEGASUS_TEST_CERT_DIR)/$(TEST_CERT_NAME).cert \             -f $(PEGASUS_TEST_CERT_DIR)/$(TEST_CERT_NAME).cert \
             -c $(TEST_CERT_USER)              -U $(TEST_CERT_USER) \
               -T $(TEST_CERT_TYPE)
 else else
         ssltrustmgr -a \          cimtrust -a \
             -f $(PEGASUS_TEST_CERT_DIR)/$(TEST_CERT_NAME).cert              -f $(PEGASUS_TEST_CERT_DIR)/$(TEST_CERT_NAME).cert \
               -T $(TEST_CERT_TYPE)
 endif endif
  
 registerValidCBATestCertificates_CONFIG_OPTIONS = \ registerValidCBATestCertificates_CONFIG_OPTIONS = \
     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_USER=$($(i)_USER_NAME) $(NL))                 TEST_CERT_USER=$($(i)_USER_NAME) $(NL))
  
 ############################################################################### ###############################################################################
Line 825 
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 870 
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 1354 
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 2297 
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.2  
changed lines
  Added in v.1.6
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2