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
97 lines
2.2 KiB
C
97 lines
2.2 KiB
C
/*
|
|
* Copyright 1995-2021 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 <stdio.h>
|
|
#include "crypto/ctype.h"
|
|
#include "internal/cryptlib.h"
|
|
#include <openssl/asn1.h>
|
|
|
|
int ASN1_PRINTABLE_type(const unsigned char *s, int len)
|
|
{
|
|
int c;
|
|
int ia5 = 0;
|
|
int t61 = 0;
|
|
|
|
if (s == NULL)
|
|
return V_ASN1_PRINTABLESTRING;
|
|
|
|
if (len < 0)
|
|
len = strlen((const char *)s);
|
|
|
|
while (len-- > 0) {
|
|
c = *(s++);
|
|
if (!ossl_isasn1print(c))
|
|
ia5 = 1;
|
|
if (!ossl_isascii(c))
|
|
t61 = 1;
|
|
}
|
|
if (t61)
|
|
return V_ASN1_T61STRING;
|
|
if (ia5)
|
|
return V_ASN1_IA5STRING;
|
|
return V_ASN1_PRINTABLESTRING;
|
|
}
|
|
|
|
int ASN1_UNIVERSALSTRING_to_string(ASN1_UNIVERSALSTRING *s)
|
|
{
|
|
int i;
|
|
unsigned char *p;
|
|
|
|
if (s->type != V_ASN1_UNIVERSALSTRING)
|
|
return 0;
|
|
if ((s->length % 4) != 0)
|
|
return 0;
|
|
p = s->data;
|
|
for (i = 0; i < s->length; i += 4) {
|
|
if ((p[0] != '\0') || (p[1] != '\0') || (p[2] != '\0'))
|
|
break;
|
|
else
|
|
p += 4;
|
|
}
|
|
if (i < s->length)
|
|
return 0;
|
|
p = s->data;
|
|
for (i = 3; i < s->length; i += 4) {
|
|
*(p++) = s->data[i];
|
|
}
|
|
*(p) = '\0';
|
|
s->length /= 4;
|
|
s->type = ASN1_PRINTABLE_type(s->data, s->length);
|
|
return 1;
|
|
}
|
|
|
|
int ASN1_STRING_print(BIO *bp, const ASN1_STRING *v)
|
|
{
|
|
int i, n;
|
|
char buf[80];
|
|
const char *p;
|
|
|
|
if (v == NULL)
|
|
return 0;
|
|
n = 0;
|
|
p = (const char *)v->data;
|
|
for (i = 0; i < v->length; i++) {
|
|
if ((p[i] > '~') || ((p[i] < ' ') &&
|
|
(p[i] != '\n') && (p[i] != '\r')))
|
|
buf[n] = '.';
|
|
else
|
|
buf[n] = p[i];
|
|
n++;
|
|
if (n >= 80) {
|
|
if (BIO_write(bp, buf, n) <= 0)
|
|
return 0;
|
|
n = 0;
|
|
}
|
|
}
|
|
if (n > 0)
|
|
if (BIO_write(bp, buf, n) <= 0)
|
|
return 0;
|
|
return 1;
|
|
}
|