mirror of
https://github.com/opnsense/src.git
synced 2026-06-07 15:52:40 -04:00
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
139 lines
3.3 KiB
C
139 lines
3.3 KiB
C
/*
|
|
* Copyright 2006-2020 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 <openssl/objects.h>
|
|
#include "obj_xref.h"
|
|
#include "internal/nelem.h"
|
|
#include <openssl/err.h>
|
|
|
|
static STACK_OF(nid_triple) *sig_app, *sigx_app;
|
|
|
|
static int sig_cmp(const nid_triple *a, const nid_triple *b)
|
|
{
|
|
return a->sign_id - b->sign_id;
|
|
}
|
|
|
|
DECLARE_OBJ_BSEARCH_CMP_FN(nid_triple, nid_triple, sig);
|
|
IMPLEMENT_OBJ_BSEARCH_CMP_FN(nid_triple, nid_triple, sig);
|
|
|
|
static int sig_sk_cmp(const nid_triple *const *a, const nid_triple *const *b)
|
|
{
|
|
return (*a)->sign_id - (*b)->sign_id;
|
|
}
|
|
|
|
DECLARE_OBJ_BSEARCH_CMP_FN(const nid_triple *, const nid_triple *, sigx);
|
|
|
|
static int sigx_cmp(const nid_triple *const *a, const nid_triple *const *b)
|
|
{
|
|
int ret;
|
|
ret = (*a)->hash_id - (*b)->hash_id;
|
|
if (ret)
|
|
return ret;
|
|
return (*a)->pkey_id - (*b)->pkey_id;
|
|
}
|
|
|
|
IMPLEMENT_OBJ_BSEARCH_CMP_FN(const nid_triple *, const nid_triple *, sigx);
|
|
|
|
int OBJ_find_sigid_algs(int signid, int *pdig_nid, int *ppkey_nid)
|
|
{
|
|
nid_triple tmp;
|
|
const nid_triple *rv = NULL;
|
|
tmp.sign_id = signid;
|
|
|
|
if (sig_app != NULL) {
|
|
int idx = sk_nid_triple_find(sig_app, &tmp);
|
|
rv = sk_nid_triple_value(sig_app, idx);
|
|
}
|
|
#ifndef OBJ_XREF_TEST2
|
|
if (rv == NULL) {
|
|
rv = OBJ_bsearch_sig(&tmp, sigoid_srt, OSSL_NELEM(sigoid_srt));
|
|
}
|
|
#endif
|
|
if (rv == NULL)
|
|
return 0;
|
|
if (pdig_nid)
|
|
*pdig_nid = rv->hash_id;
|
|
if (ppkey_nid)
|
|
*ppkey_nid = rv->pkey_id;
|
|
return 1;
|
|
}
|
|
|
|
int OBJ_find_sigid_by_algs(int *psignid, int dig_nid, int pkey_nid)
|
|
{
|
|
nid_triple tmp;
|
|
const nid_triple *t = &tmp;
|
|
const nid_triple **rv = NULL;
|
|
|
|
tmp.hash_id = dig_nid;
|
|
tmp.pkey_id = pkey_nid;
|
|
|
|
if (sigx_app) {
|
|
int idx = sk_nid_triple_find(sigx_app, &tmp);
|
|
if (idx >= 0) {
|
|
t = sk_nid_triple_value(sigx_app, idx);
|
|
rv = &t;
|
|
}
|
|
}
|
|
#ifndef OBJ_XREF_TEST2
|
|
if (rv == NULL) {
|
|
rv = OBJ_bsearch_sigx(&t, sigoid_srt_xref, OSSL_NELEM(sigoid_srt_xref));
|
|
}
|
|
#endif
|
|
if (rv == NULL)
|
|
return 0;
|
|
if (psignid)
|
|
*psignid = (*rv)->sign_id;
|
|
return 1;
|
|
}
|
|
|
|
int OBJ_add_sigid(int signid, int dig_id, int pkey_id)
|
|
{
|
|
nid_triple *ntr;
|
|
if (sig_app == NULL)
|
|
sig_app = sk_nid_triple_new(sig_sk_cmp);
|
|
if (sig_app == NULL)
|
|
return 0;
|
|
if (sigx_app == NULL)
|
|
sigx_app = sk_nid_triple_new(sigx_cmp);
|
|
if (sigx_app == NULL)
|
|
return 0;
|
|
if ((ntr = OPENSSL_malloc(sizeof(*ntr))) == NULL) {
|
|
ERR_raise(ERR_LIB_OBJ, ERR_R_MALLOC_FAILURE);
|
|
return 0;
|
|
}
|
|
ntr->sign_id = signid;
|
|
ntr->hash_id = dig_id;
|
|
ntr->pkey_id = pkey_id;
|
|
|
|
if (!sk_nid_triple_push(sig_app, ntr)) {
|
|
OPENSSL_free(ntr);
|
|
return 0;
|
|
}
|
|
|
|
if (!sk_nid_triple_push(sigx_app, ntr))
|
|
return 0;
|
|
|
|
sk_nid_triple_sort(sig_app);
|
|
sk_nid_triple_sort(sigx_app);
|
|
|
|
return 1;
|
|
}
|
|
|
|
static void sid_free(nid_triple *tt)
|
|
{
|
|
OPENSSL_free(tt);
|
|
}
|
|
|
|
void OBJ_sigid_free(void)
|
|
{
|
|
sk_nid_triple_pop_free(sig_app, sid_free);
|
|
sig_app = NULL;
|
|
sk_nid_triple_free(sigx_app);
|
|
sigx_app = NULL;
|
|
}
|