Skip to content

Commit

Permalink
build(deps-dev): update pydantic requirement from ~=1.0 to ~=2.4 (#56)
Browse files Browse the repository at this point in the history
* build(deps-dev): update pydantic requirement from ~=1.0 to ~=2.4

Updates the requirements on [pydantic](https://github.com/pydantic/pydantic) to permit the latest version.
- [Release notes](https://github.com/pydantic/pydantic/releases)
- [Changelog](https://github.com/pydantic/pydantic/blob/main/HISTORY.md)
- [Commits](pydantic/pydantic@v1.0...v2.4.2)

---
updated-dependencies:
- dependency-name: pydantic
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

* limbo: Pydantic 2.x accomodations

Signed-off-by: William Woodruff <[email protected]>

* gocryptox509: regenerate schema.go

This is almost certainly broken.

Signed-off-by: William Woodruff <[email protected]>

* gocryptox509: Fix types

* openssl: Use correct date parsing format

* gocryptox509: Fix signature algorithm type

* gocryptox509: Regenerate `schema.go`

* more Pydantic V2 changes

Signed-off-by: William Woodruff <[email protected]>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: William Woodruff <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: William Woodruff <[email protected]>
Co-authored-by: Alex Cameron <[email protected]>
  • Loading branch information
3 people authored Dec 19, 2023
1 parent df79c26 commit 66da203
Show file tree
Hide file tree
Showing 9 changed files with 10,334 additions and 10,335 deletions.
24 changes: 15 additions & 9 deletions harness/gocryptox509/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -109,28 +109,34 @@ func concatPEMCerts(certs []string) []byte {
func evaluateTestcase(testcase Testcase) (testcaseResult, error) {
_ = spew.Dump

if testcase.Features != nil {
for _, feature := range testcase.Features {
if feature == "max-chain-depth" {
return resultSkipped, fmt.Errorf("max chain depth not supported")
}
for _, feature := range testcase.Features {
if feature == "max-chain-depth" {
return resultSkipped, fmt.Errorf("max chain depth not supported")
}
}

var ts time.Time
if testcase.ValidationTime == nil {
ts = time.Now()
} else {
ts = *testcase.ValidationTime
var err error
ts, err = time.Parse(time.RFC3339, testcase.ValidationTime.(string))

if err != nil {
fmt.Printf("%s\n", err)
return resultSkipped, errors.Wrap(err, "unable to parse testcase time as RFC3339")
}
}

// TODO: Support testcases that constrain signature algorthms.
if len(testcase.SignatureAlgorithms) != 0 {
var signatureAlgorithms = testcase.SignatureAlgorithms
if len(signatureAlgorithms) != 0 {
return resultSkipped, fmt.Errorf("signature algorithm checks not supported yet")
}

// TODO: Support testcases that constrain key usages.
if len(testcase.KeyUsage) != 0 {
var keyUsage = testcase.KeyUsage
if len(keyUsage) != 0 {
return resultSkipped, fmt.Errorf("key usage checks not supported yet")
}

Expand All @@ -139,7 +145,7 @@ func evaluateTestcase(testcase Testcase) (testcaseResult, error) {
}

var ekus []x509.ExtKeyUsage
if len(testcase.ExtendedKeyUsage) != 0 {
if testcase.ExtendedKeyUsage != nil {
extKeyUsagesMap := map[KnownEKUs]x509.ExtKeyUsage{
KnownEKUsAnyExtendedKeyUsage: x509.ExtKeyUsageAny,
KnownEKUsClientAuth: x509.ExtKeyUsageClientAuth,
Expand Down
Loading

0 comments on commit 66da203

Please sign in to comment.