mirror of
https://git.FreeBSD.org/src.git
synced 2024-10-18 02:19:39 +00:00
e4520c8bd1
Summary: Release notes can be found at https://www.openssl.org/news/openssl-3.0-notes.html . Obtained from: https://www.openssl.org/source/openssl-3.0.8.tar.gz Differential Revision: https://reviews.freebsd.org/D38835 Test Plan: ``` $ git status On branch vendor/openssl-3.0 nothing to commit, working tree clean $ (cd ..; fetch http://www.openssl.org/source/openssl-${OSSLVER}.tar.gz http://www.openssl.org/source/openssl-${OSSLVER}.tar.gz.asc) openssl-3.0.8.tar.gz 14 MB 4507 kBps 04s openssl-3.0.8.tar.gz.asc 833 B 10 MBps 00s $ set | egrep '(XLIST|OSSLVER)=' OSSLVER=3.0.8 XLIST=FREEBSD-Xlist $ gpg --list-keys /home/ngie/.gnupg/pubring.kbx ----------------------------- pub rsa4096 2014-10-04 [SC] 7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C uid [ unknown] Richard Levitte <richard@levitte.org> uid [ unknown] Richard Levitte <levitte@lp.se> uid [ unknown] Richard Levitte <levitte@openssl.org> sub rsa4096 2014-10-04 [E] $ gpg --verify openssl-${OSSLVER}.tar.gz.asc openssl-${OSSLVER}.tar.gz gpg: Signature made Tue Feb 7 05:43:55 2023 PST gpg: using RSA key 7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C gpg: Good signature from "Richard Levitte <richard@levitte.org>" [unknown] gpg: aka "Richard Levitte <levitte@lp.se>" [unknown] gpg: aka "Richard Levitte <levitte@openssl.org>" [unknown] gpg: WARNING: This key is not certified with a trusted signature! gpg: There is no indication that the signature belongs to the owner. Primary key fingerprint: 7953 AC1F BC3D C8B3 B292 393E D5E9 E43F 7DF9 EE8C $ (cd vendor.checkout/; git status; find . -type f -or -type l | cut -c 3- | sort > ../old) On branch vendor/openssl-3.0 nothing to commit, working tree clean $ tar -x -X $XLIST -f ../openssl-${OSSLVER}.tar.gz -C .. $ rsync --exclude FREEBSD.* --delete -avzz ../openssl-${OSSLVER}/* . $ cat .git gitdir: /home/ngie/git/freebsd-src/.git/worktrees/vendor.checkout $ diff -arq ../openssl-3.0.8 . Only in .: .git Only in .: FREEBSD-Xlist Only in .: FREEBSD-upgrade $ git status FREEBSD* On branch vendor/openssl-3.0 nothing to commit, working tree clean $ ``` Reviewers: emaste, jkim Subscribers: imp, andrew, dab Differential Revision: https://reviews.freebsd.org/D38835
200 lines
6.0 KiB
C
200 lines
6.0 KiB
C
/*
|
|
* Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include "internal/cryptlib.h"
|
|
#include "internal/der.h"
|
|
#include "crypto/bn.h"
|
|
|
|
static int int_start_context(WPACKET *pkt, int tag)
|
|
{
|
|
if (tag < 0)
|
|
return 1;
|
|
if (!ossl_assert(tag <= 30))
|
|
return 0;
|
|
return WPACKET_start_sub_packet(pkt);
|
|
}
|
|
|
|
static int int_end_context(WPACKET *pkt, int tag)
|
|
{
|
|
/*
|
|
* If someone set the flag WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH on this
|
|
* sub-packet and this sub-packet has nothing written to it, the DER length
|
|
* will not be written, and the total written size will be unchanged before
|
|
* and after WPACKET_close(). We use size1 and size2 to determine if
|
|
* anything was written, and only write our tag if it has.
|
|
*
|
|
*/
|
|
size_t size1, size2;
|
|
|
|
if (tag < 0)
|
|
return 1;
|
|
if (!ossl_assert(tag <= 30))
|
|
return 0;
|
|
|
|
/* Context specific are normally (?) constructed */
|
|
tag |= DER_F_CONSTRUCTED | DER_C_CONTEXT;
|
|
|
|
return WPACKET_get_total_written(pkt, &size1)
|
|
&& WPACKET_close(pkt)
|
|
&& WPACKET_get_total_written(pkt, &size2)
|
|
&& (size1 == size2 || WPACKET_put_bytes_u8(pkt, tag));
|
|
}
|
|
|
|
int ossl_DER_w_precompiled(WPACKET *pkt, int tag,
|
|
const unsigned char *precompiled,
|
|
size_t precompiled_n)
|
|
{
|
|
return int_start_context(pkt, tag)
|
|
&& WPACKET_memcpy(pkt, precompiled, precompiled_n)
|
|
&& int_end_context(pkt, tag);
|
|
}
|
|
|
|
int ossl_DER_w_boolean(WPACKET *pkt, int tag, int b)
|
|
{
|
|
return int_start_context(pkt, tag)
|
|
&& WPACKET_start_sub_packet(pkt)
|
|
&& (!b || WPACKET_put_bytes_u8(pkt, 0xFF))
|
|
&& !WPACKET_close(pkt)
|
|
&& !WPACKET_put_bytes_u8(pkt, DER_P_BOOLEAN)
|
|
&& int_end_context(pkt, tag);
|
|
}
|
|
|
|
int ossl_DER_w_octet_string(WPACKET *pkt, int tag,
|
|
const unsigned char *data, size_t data_n)
|
|
{
|
|
return int_start_context(pkt, tag)
|
|
&& WPACKET_start_sub_packet(pkt)
|
|
&& WPACKET_memcpy(pkt, data, data_n)
|
|
&& WPACKET_close(pkt)
|
|
&& WPACKET_put_bytes_u8(pkt, DER_P_OCTET_STRING)
|
|
&& int_end_context(pkt, tag);
|
|
}
|
|
|
|
int ossl_DER_w_octet_string_uint32(WPACKET *pkt, int tag, uint32_t value)
|
|
{
|
|
unsigned char tmp[4] = { 0, 0, 0, 0 };
|
|
unsigned char *pbuf = tmp + (sizeof(tmp) - 1);
|
|
|
|
while (value > 0) {
|
|
*pbuf-- = (value & 0xFF);
|
|
value >>= 8;
|
|
}
|
|
return ossl_DER_w_octet_string(pkt, tag, tmp, sizeof(tmp));
|
|
}
|
|
|
|
static int int_der_w_integer(WPACKET *pkt, int tag,
|
|
int (*put_bytes)(WPACKET *pkt, const void *v,
|
|
unsigned int *top_byte),
|
|
const void *v)
|
|
{
|
|
unsigned int top_byte = 0;
|
|
|
|
return int_start_context(pkt, tag)
|
|
&& WPACKET_start_sub_packet(pkt)
|
|
&& put_bytes(pkt, v, &top_byte)
|
|
&& ((top_byte & 0x80) == 0 || WPACKET_put_bytes_u8(pkt, 0))
|
|
&& WPACKET_close(pkt)
|
|
&& WPACKET_put_bytes_u8(pkt, DER_P_INTEGER)
|
|
&& int_end_context(pkt, tag);
|
|
}
|
|
|
|
static int int_put_bytes_uint32(WPACKET *pkt, const void *v,
|
|
unsigned int *top_byte)
|
|
{
|
|
const uint32_t *value = v;
|
|
uint32_t tmp = *value;
|
|
size_t n = 0;
|
|
|
|
while (tmp != 0) {
|
|
n++;
|
|
*top_byte = (tmp & 0xFF);
|
|
tmp >>= 8;
|
|
}
|
|
if (n == 0)
|
|
n = 1;
|
|
|
|
return WPACKET_put_bytes__(pkt, *value, n);
|
|
}
|
|
|
|
/* For integers, we only support unsigned values for now */
|
|
int ossl_DER_w_uint32(WPACKET *pkt, int tag, uint32_t v)
|
|
{
|
|
return int_der_w_integer(pkt, tag, int_put_bytes_uint32, &v);
|
|
}
|
|
|
|
static int int_put_bytes_bn(WPACKET *pkt, const void *v,
|
|
unsigned int *top_byte)
|
|
{
|
|
unsigned char *p = NULL;
|
|
size_t n = BN_num_bytes(v);
|
|
|
|
/* The BIGNUM limbs are in LE order */
|
|
*top_byte =
|
|
((bn_get_words(v) [(n - 1) / BN_BYTES]) >> (8 * ((n - 1) % BN_BYTES)))
|
|
& 0xFF;
|
|
|
|
if (!WPACKET_allocate_bytes(pkt, n, &p))
|
|
return 0;
|
|
if (p != NULL)
|
|
BN_bn2bin(v, p);
|
|
return 1;
|
|
}
|
|
|
|
int ossl_DER_w_bn(WPACKET *pkt, int tag, const BIGNUM *v)
|
|
{
|
|
if (v == NULL || BN_is_negative(v))
|
|
return 0;
|
|
if (BN_is_zero(v))
|
|
return ossl_DER_w_uint32(pkt, tag, 0);
|
|
|
|
return int_der_w_integer(pkt, tag, int_put_bytes_bn, v);
|
|
}
|
|
|
|
int ossl_DER_w_null(WPACKET *pkt, int tag)
|
|
{
|
|
return int_start_context(pkt, tag)
|
|
&& WPACKET_start_sub_packet(pkt)
|
|
&& WPACKET_close(pkt)
|
|
&& WPACKET_put_bytes_u8(pkt, DER_P_NULL)
|
|
&& int_end_context(pkt, tag);
|
|
}
|
|
|
|
/* Constructed things need a start and an end */
|
|
int ossl_DER_w_begin_sequence(WPACKET *pkt, int tag)
|
|
{
|
|
return int_start_context(pkt, tag)
|
|
&& WPACKET_start_sub_packet(pkt);
|
|
}
|
|
|
|
int ossl_DER_w_end_sequence(WPACKET *pkt, int tag)
|
|
{
|
|
/*
|
|
* If someone set the flag WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH on this
|
|
* sub-packet and this sub-packet has nothing written to it, the DER length
|
|
* will not be written, and the total written size will be unchanged before
|
|
* and after WPACKET_close(). We use size1 and size2 to determine if
|
|
* anything was written, and only write our tag if it has.
|
|
*
|
|
* Because we know that int_end_context() needs to do the same check,
|
|
* we reproduce this flag if the written length was unchanged, or we will
|
|
* have an erroneous context tag.
|
|
*/
|
|
size_t size1, size2;
|
|
|
|
return WPACKET_get_total_written(pkt, &size1)
|
|
&& WPACKET_close(pkt)
|
|
&& WPACKET_get_total_written(pkt, &size2)
|
|
&& (size1 == size2
|
|
? WPACKET_set_flags(pkt, WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH)
|
|
: WPACKET_put_bytes_u8(pkt, DER_F_CONSTRUCTED | DER_P_SEQUENCE))
|
|
&& int_end_context(pkt, tag);
|
|
}
|