diff options
| author | Steve McIntyre <steve@einval.com> | 2021-03-23 23:49:46 +0000 |
|---|---|---|
| committer | Steve McIntyre <steve@einval.com> | 2021-03-23 23:49:46 +0000 |
| commit | 1251a7ba86fc40a6aad8b4fecdbca2b61808d9fa (patch) | |
| tree | 2125fda549aaca55cb49a48d54be77dec7fbf3df /Cryptlib/OpenSSL/crypto/asn1 | |
| parent | 85b409232ce89b34626df9d72abedf5d4f5ccef6 (diff) | |
| parent | 031e5cce385d3f96b1caa1d53495332a7eb03749 (diff) | |
| download | efi-boot-shim-debian/15.3-1.tar.gz efi-boot-shim-debian/15.3-1.zip | |
Update upstream source from tag 'upstream/15.3'debian/15.3-1
Update to upstream version '15.3'
with Debian dir 1b484f1c1ac270604a5a1451b34de4b0865c6211
Diffstat (limited to 'Cryptlib/OpenSSL/crypto/asn1')
| -rw-r--r-- | Cryptlib/OpenSSL/crypto/asn1/asn_mime.c | 4 | ||||
| -rw-r--r-- | Cryptlib/OpenSSL/crypto/asn1/t_req.c | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/Cryptlib/OpenSSL/crypto/asn1/asn_mime.c b/Cryptlib/OpenSSL/crypto/asn1/asn_mime.c index 5170906c..017be9d9 100644 --- a/Cryptlib/OpenSSL/crypto/asn1/asn_mime.c +++ b/Cryptlib/OpenSSL/crypto/asn1/asn_mime.c @@ -843,6 +843,10 @@ static int mime_hdr_addparam(MIME_HEADER *mhdr, char *name, char *value) char *tmpname, *tmpval, *p; int c; MIME_PARAM *mparam; + + if (!mhdr) + return 0; + if (name) { tmpname = BUF_strdup(name); if (!tmpname) diff --git a/Cryptlib/OpenSSL/crypto/asn1/t_req.c b/Cryptlib/OpenSSL/crypto/asn1/t_req.c index 70aba4cc..c32241c2 100644 --- a/Cryptlib/OpenSSL/crypto/asn1/t_req.c +++ b/Cryptlib/OpenSSL/crypto/asn1/t_req.c @@ -195,10 +195,11 @@ int X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflags, goto err; if (BIO_puts(bp, ":") <= 0) goto err; - if ((type == V_ASN1_PRINTABLESTRING) || + if (bs != NULL && ( + (type == V_ASN1_PRINTABLESTRING) || (type == V_ASN1_UTF8STRING) || (type == V_ASN1_T61STRING) || - (type == V_ASN1_IA5STRING)) { + (type == V_ASN1_IA5STRING))) { if (BIO_write(bp, (char *)bs->data, bs->length) != bs->length) goto err; |