summaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2022-01-05Two minor KNF tweaksTheo Buehler
2022-01-05Use child_aor and parent_aor instead of aorc and aorpTheo Buehler
suggested by jsing
2022-01-05Rename fp and fc into parent_af and child_af for readability.Theo Buehler
suggested by jsing
2022-01-05Globally rename all IPAddressFamily *f into af since this is slightlyTheo Buehler
more readable. Repeated complaints by jsing
2022-01-05Add a helper function to turn unchecked (but sound) use ofTheo Buehler
sk_find + sk_value into something easier to follow and swallow. ok inoguchi jsing
2022-01-05Hoist IPAddressFamily_cmp() to the other IPAddressFamily functions.Theo Buehler
ok inoguchi jsing
2022-01-05Call x a cert for readability.Theo Buehler
2022-01-05Now that i is free, rename j to i for use as loop variable inTheo Buehler
various loops in addr_validate_path_internal().
2022-01-05In addr_validate_path_internal() rename i to depth because that'sTheo Buehler
what it is.
2022-01-05Turn the validation_err() macro into a functionTheo Buehler
validation_err() is an ugly macro with side effects and a goto in it. At the cost of a few lines of code we can turn this into a function where the side effects are explicit and ret is now explicitly set in the main body of addr_validate_path_internal(). We get to a point where it is halfway possible to reason about the convoluted control flow in this function. ok inoguchi jsing
2022-01-05Move variable declarations in X509v3_addr_canonize() to the top ofTheo Buehler
the function and unindent some code. ok inoguchi jsing
2022-01-05Rename tls13_key_share to tls_key_share.Joel Sing
In preparation to use the key share code in both the TLSv1.3 and legacy stacks, rename tls13_key_share to tls_key_share, moving it into the shared handshake struct. Further changes will then allow the legacy stack to make use of the same code for ephemeral key exchange. ok inoguchi@ tb@
2022-01-05Remove a bogus memcmp in range_should_be_prefix()Theo Buehler
range_should_be_prefix() currently always fails. The reason for this is that OpenSSL commit 42d7d7dd incorrectly moved a memcmp() out of an assertion. As a consequence, the library emits and accepts incorrectly encoded ipAddrBlock extensions since it will never detect ranges that MUST be encoded as a prefix according to RFC 3779, 2.2.3.7. The return -1 from this memcmp() indicates to the callers that the range should be expressed as a range, so callers must check beforehand that min <= max to be able to fail. Thus, remove this memcmp() and add a check to make_addressRange(), the only caller that didn't already ensure that min <= max. This fixes the noisy output in regress/lib/libcrypto/x509/rfc3779. ok inoguchi jsing
2022-01-05Polish X509v3_addr_subset() a bitTheo Buehler
Use child and parent instead of a and b. Split unrelated checks. Use accessors and assign to local variables to avoid ugly line wrapping. Declare vriables up front instead of mixing declarations with assignments from function returns. ok inoguchi jsing
2022-01-05Readability tweaks in addr_contains()Theo Buehler
Assign to local variables to avoid ugly line wrapping. ok inoguchi jsing
2022-01-05Fix a bug in addr_contains() introduced in OpenSSL commit be71c372Theo Buehler
by returning 0 instead of -1 on extract_min_max() failure. Callers would interpret -1 as success of addr_contains(). ok inoguchi jsing
2022-01-04Readability tweaks in the print helper i2r_IPAddressOrRanges.Theo Buehler
Assign repeated nested expressions to local variables and avoid some awkward line wrapping.
2022-01-04Consistently name variables with a _len suffix instead of mixingTheo Buehler
things like prefixlen, afi_length, etc. suggested by jsing
2022-01-04Only check the parent to be canonical once we know it is non-NULL.Theo Buehler
suggested by jsing during review
2022-01-04Refactor extract_min_max()Theo Buehler
extract_min_max() crammed all the work in two return statements inside a switch. Make this more readable by splitting out the extraction of the min and max as BIT STRINGs from an addressPrefix or an addressRange and once that's done expanding them to raw addresses. ok inoguchi jsing
2022-01-04Remove checks that are duplicated in extract_min_max()Theo Buehler
The NULL checks and the checks that aor->type is reasonable are already performed in extract_min_max(), so it is unnecessary to repeat them in X509v3_addr_get_range() ok inoguchi jsing
2022-01-04Make X509v3_addr_get_range() readable.Theo Buehler
Instead of checking everything in a single if statement, group the checks according to their purposes. ok inoguchi jsing
2022-01-04Add a length check to make_addressPrefix()Theo Buehler
Make the callers pass in the afi so that make_addressPrefix() can check prefixlen to be reasonable. If the afi is anything else than IPv4 or IPv6, cap its length at the length needed for IPv6. This way we avoid arbitrary out-of-bounds reads if the caller decides to pass in something stupid. ok inoguchi jsing
2022-01-04Remove some dead codeTheo Buehler
IPAddressRange_new() populates both its min and max members, so they won't ever be NULL and will never need to be allocated. ok inoguchi jsing
2022-01-04Drop a pointless NULL checkTheo Buehler
IPAddressOrRange_new() instantiates a choice type, so we need to allocate one member of the union ourselves, so aor->u.addressPrefix will always be NULL. ok inoguchi jsing
2022-01-04First pass over x509_addr_validate_path()Theo Buehler
Replace reaching into the structs with IPAddressFamily accessors and add a few comments that explain what the code is actually doing. ok inoguchi jsing
2022-01-04Refactor IPAddressFamily accessorsTheo Buehler
Introduce a helper function that allows fetching the AFI and the optional SAFI out of an IPAddressFamily. Also add two wrappers that only fetch and validate the AFI, where validation currently only means that the length is between 2 and 3. Use these accessors throughout to simplify and streamline the code. ok inoguchi jsing
2022-01-04Return 0 on failure from send/get kex functions in the legacy stack.Joel Sing
In the legacy stack, a message handling function returns -1 for failure, 0 for need more data and 1 for success (although in extra special cases 2 may also be used). However, the various send/get kex functions only need to indicate success or failure - switch these to return 0 on failure (rather than -1) and use normal result testing. This leaves GOST unchanged for now, as that code is special and needs extra work. ok inoguchi@ tb@
2022-01-04Use normal result testing for tls1_check_curve().Joel Sing
2022-01-04Refactor ssl3_get_server_kex_ecdhe() to separate parsing and validation.Joel Sing
If we receive something other than a "named curve", send a handshake failure alert as we're unable to complete the handshake with the given parameters. If the server responded with a curve that we did not advertise send an illegal parameter alert. ok inoguchi@ tb@
2022-01-04Pull key share group/length CBB code up from tls13_key_share_public()Joel Sing
This provides better symmetry with the parsing code and will allow for better reuse with the legacy stack, which has different message structures. ok inoguchi@ tb@
2022-01-04Only allow zero length key shares when we know we're doing HRR.Joel Sing
ok inoguchi@ tb@
2022-01-03By default, put intermediate files in a temp dir and remove it onPhilip Guenther
completion. To leave files in /tmp, use new -k option.
2022-01-02fix strange indentation in code exampleTheo Buehler
2022-01-02Don't use *ENTRY_NB() with END_BUILTIN(), at least yetPhilip Guenther
Problem noted by naddy@
2022-01-01Add ENTRY_NB() macro for doing an ASM function entry without settingPhilip Guenther
the binding to global (NB == "no binding"), as clang 13 is now warning about changing the binding from global to weak. This first pass does amd64 and sparc64 and pulls DEFS.h out of the per-arch directory to a common directory; others to follow ok kettenis@
2022-01-01failured -> failedJonathan Gray
2022-01-01contibutions -> contributionsJonathan Gray
2022-01-01identfier -> identifierJonathan Gray
2021-12-31excpetions -> exceptionsJonathan Gray
2021-12-31deafult -> defaultJonathan Gray
2021-12-28Fix typo in commentTheo Buehler
2021-12-28Use lowercase letters for hexadecimal constants, as both jsing and ITheo Buehler
prefer this.
2021-12-28Rewrite X509v3_addr_canonize() with new accessorsTheo Buehler
This is again a straightforward conversion and leads to something which matches our usual style more. ok jsing
2021-12-28Validate AFIs before sorting in X509v3_adr_canonize()Theo Buehler
Again, we're dealing with necessarily not fully validated data here, so a check up front seems prudent. ok jsing
2021-12-28Rewrite/simplify X509v3_addr_is_canonical()Theo Buehler
This is a more or less straightforward conversion using the new IPAddressFamily accessor API. As a result, some checks have become a bit stricter, which is only desirable here. ok jsing
2021-12-28Check AFI/SAFI before comparing them in X509v3_addr_is_canonical()Theo Buehler
As mentioned in a previous commit, IPAddressFamily_cmp() can't really check for trailing garbage in addressFamily->data. Since the path validation and hence the X.509 validator call X509v3_addr_is_canonical(), this deals with only partially validated data. ok jsing
2021-12-28Make IPAddressFamily_cmp() more pleasing on the eyeTheo Buehler
Define and use MINIMUM() instead of a ternary operator and separate the code from the declarations. Also, we can spare a line to make the return legible instead of squeezing it into another ternary operator. addressFamily->data contains a two-bytes AFI and an optional one-byte SAFI. This function currently also compares any trailing garbage that may be present. Since comparison functions can't really error, this needs to be checked bofore it is used. Such checks will be added in subsequent commits. ok jsing
2021-12-28Style improvements in X509v3_addr_add_range()Theo Buehler
ok jsing
2021-12-28Style improvements in X509v3_addr_add_prefix()Theo Buehler
ok jsing
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-13 14:12:36 +0000