-
Notifications
You must be signed in to change notification settings - Fork 15
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
9 changed files
with
47 additions
and
66 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| 3.3.3.0 | ||
| 3.3.5.0 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| /* $OpenBSD: t_x509a.c,v 1.8 2014/07/11 08:44:47 jsing Exp $ */ | ||
| /* $OpenBSD: t_x509a.c,v 1.8.16.1 2021/08/20 19:54:59 benno Exp $ */ | ||
| /* Written by Dr Stephen N Henson ([email protected]) for the OpenSSL | ||
| * project 1999. | ||
| */ | ||
|
|
@@ -105,8 +105,8 @@ X509_CERT_AUX_print(BIO *out, X509_CERT_AUX *aux, int indent) | |
| } else | ||
| BIO_printf(out, "%*sNo Rejected Uses.\n", indent, ""); | ||
| if (aux->alias) | ||
| BIO_printf(out, "%*sAlias: %s\n", indent, "", | ||
| aux->alias->data); | ||
| BIO_printf(out, "%*sAlias: %.*s\n", indent, "", | ||
| aux->alias->length, aux->alias->data); | ||
| if (aux->keyid) { | ||
| BIO_printf(out, "%*sKey Id: ", indent, ""); | ||
| for (i = 0; i < aux->keyid->length; i++) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| /* $OpenBSD: x509_constraints.c,v 1.15 2021/03/12 15:57:30 tb Exp $ */ | ||
| /* $OpenBSD: x509_constraints.c,v 1.15.2.1 2021/09/26 14:07:40 deraadt Exp $ */ | ||
| /* | ||
| * Copyright (c) 2020 Bob Beck <[email protected]> | ||
| * | ||
|
|
@@ -334,16 +334,16 @@ x509_constraints_parse_mailbox(uint8_t *candidate, size_t len, | |
| if (c == '.') | ||
| goto bad; | ||
| } | ||
| if (wi > DOMAIN_PART_MAX_LEN) | ||
| goto bad; | ||
| if (accept) { | ||
| if (wi >= DOMAIN_PART_MAX_LEN) | ||
| goto bad; | ||
| working[wi++] = c; | ||
| accept = 0; | ||
| continue; | ||
| } | ||
| if (candidate_local != NULL) { | ||
| /* We are looking for the domain part */ | ||
| if (wi > DOMAIN_PART_MAX_LEN) | ||
| if (wi >= DOMAIN_PART_MAX_LEN) | ||
| goto bad; | ||
| working[wi++] = c; | ||
| if (i == len - 1) { | ||
|
|
@@ -358,7 +358,7 @@ x509_constraints_parse_mailbox(uint8_t *candidate, size_t len, | |
| continue; | ||
| } | ||
| /* We are looking for the local part */ | ||
| if (wi > LOCAL_PART_MAX_LEN) | ||
| if (wi >= LOCAL_PART_MAX_LEN) | ||
| break; | ||
|
|
||
| if (quoted) { | ||
|
|
@@ -378,6 +378,8 @@ x509_constraints_parse_mailbox(uint8_t *candidate, size_t len, | |
| */ | ||
| if (c == 9) | ||
| goto bad; | ||
| if (wi >= LOCAL_PART_MAX_LEN) | ||
| goto bad; | ||
| working[wi++] = c; | ||
| continue; /* all's good inside our quoted string */ | ||
| } | ||
|
|
@@ -407,6 +409,8 @@ x509_constraints_parse_mailbox(uint8_t *candidate, size_t len, | |
| } | ||
| if (!local_part_ok(c)) | ||
| goto bad; | ||
| if (wi >= LOCAL_PART_MAX_LEN) | ||
| goto bad; | ||
| working[wi++] = c; | ||
| } | ||
| if (candidate_local == NULL || candidate_domain == NULL) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| /* $OpenBSD: x509_vpm.c,v 1.25 2021/04/15 14:15:03 tb Exp $ */ | ||
| /* $OpenBSD: x509_vpm.c,v 1.25.2.1 2021/09/30 18:25:43 deraadt Exp $ */ | ||
| /* Written by Dr Stephen N Henson ([email protected]) for the OpenSSL | ||
| * project 2004. | ||
| */ | ||
|
|
@@ -598,6 +598,7 @@ static const X509_VERIFY_PARAM_ID _empty_id = { NULL }; | |
| static const X509_VERIFY_PARAM default_table[] = { | ||
| { | ||
| .name = "default", | ||
| .flags = X509_V_FLAG_TRUSTED_FIRST, | ||
| .depth = 100, | ||
| .trust = 0, /* XXX This is not the default trust value */ | ||
| .id = vpm_empty_id | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters