*** openssl-0.9.7b/Makefile.org-dist	Tue Apr  8 13:54:32 2003
--- openssl-0.9.7b/Makefile.org	Thu Aug 28 16:38:34 2003
***************
*** 182,188 ****
  	des rc2 rc4 rc5 idea bf cast \
  	bn ec rsa dsa dh dso engine aes \
  	buffer bio stack lhash rand err objects \
! 	evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5
  
  # tests to perform.  "alltests" is a special word indicating that all tests
  # should be performed.
--- 182,189 ----
  	des rc2 rc4 rc5 idea bf cast \
  	bn ec rsa dsa dh dso engine aes \
  	buffer bio stack lhash rand err objects \
! 	evp asn1 pem x509 x509v3 conf txt_db pkcs7 \
! 	pkcs12 comp ocsp ui krb5 scvp
  
  # tests to perform.  "alltests" is a special word indicating that all tests
  # should be performed.
*** openssl-0.9.7b/crypto/objects/objects.txt-dist	Mon Jan 13 16:55:52 2003
--- openssl-0.9.7b/crypto/objects/objects.txt	Sat Aug  2 18:27:53 2003
***************
*** 144,149 ****
--- 144,154 ----
  id-smime-ct 6		: id-smime-ct-contentInfo
  id-smime-ct 7		: id-smime-ct-DVCSRequestData
  id-smime-ct 8		: id-smime-ct-DVCSResponseData
+ id-smime-ct 9		: id-smime-ct-compressedData
+ id-smime-ct 10		: id-smime-ct-SCVPcertValRequest
+ id-smime-ct 11		: id-smime-ct-SCVPcertValResponse
+ id-smime-ct 12		: id-smime-ct-SCVPvalPolRequest
+ id-smime-ct 13		: id-smime-ct-SCVPvalPolResponse
  
  # S/MIME Attributes
  id-smime-aa 1		: id-smime-aa-receiptRequest
***************
*** 312,317 ****
--- 317,325 ----
  id-pkix 10		: id-aca
  id-pkix 11		: id-qcs
  id-pkix 12		: id-cct
+ id-pkix 17		: id-stc
+ id-pkix 18		: id-swb
+ id-pkix 19		: id-svp
  id-pkix 48		: id-ad
  
  # PKIX Modules
***************
*** 331,336 ****
--- 339,348 ----
  id-pkix-mod 14		: id-mod-ocsp
  id-pkix-mod 15		: id-mod-dvcs
  id-pkix-mod 16		: id-mod-cmp2000
+ id-pkix-mod 17		: id-mod-pkix1-algorithms
+ #id-pkix-mod 18		: id-pkix1-explicit-88 (RFC 3280)
+ #id-pkix-mod 19		: id-pkix1-implicit-88 (RFC 3280)
+ id-pkix-mod 21		: id-mod-scvp
  
  # PKIX Private Extensions
  !Cname info-access
***************
*** 914,916 ****
--- 926,966 ----
  
  rsadsi 3 10		: DES-CDMF		: des-cdmf
  rsadsi 1 1 6		: rsaOAEPEncryptionSET
+ 
+ #SCVP
+ 
+ !module id-stc
+ id-stc 1		: build-pkc-path
+ id-stc 2		: build-valid-pkc-path
+ id-stc 3		: build-status-checked-pkc-path
+ id-stc 4		: build-aa-path
+ id-stc 5		: build-valid-aa-path
+ id-stc 6		: build-status-checked-aa-path
+ id-stc 7		: status-check-ac-and-build-status-checked-aa-path
+ !global
+ 
+ !module id-swb
+ id-swb 1		: pkc-cert-path
+ id-swb 2		: pkc-revocation-info
+ id-swb 3		: pkc-cert-status
+ id-swb 4		: pkc-public-key-info
+ id-swb 5		: aa-cert-path
+ id-swb 6		: aa-revocation-info
+ id-swb 7		: ac-revocation-info
+ id-swb 8		: ac-cert-status
+ !global
+ 
+ !module id-svp
+ id-svp 1		: defaultValPolicy
+ id-svp 2		: NameValPol
+ !global
+ 
+ !Alias id-nvpe id-svp-NameValPol 1
+ !module id-nvpe
+ id-nvpe 1		: NameMismatch
+ id-nvpe 2		: NoCertName
+ id-nvpe 3		: UnknownPurpose
+ id-nvpe 4		: BadName
+ id-nvpe 5		: BadNameType
+ !global
+