26a7d938c9
Since return is inconsistent, I removed unnecessary parentheses and unified them. Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4541)
36 lines
1 KiB
C
36 lines
1 KiB
C
/*
|
|
* Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the OpenSSL license (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 "internal/cryptlib.h"
|
|
#include <openssl/buffer.h>
|
|
#include <openssl/objects.h>
|
|
#include <openssl/evp.h>
|
|
#include <openssl/x509.h>
|
|
#include <openssl/pem.h>
|
|
|
|
/* Handle 'other' PEMs: not private keys */
|
|
|
|
void *PEM_ASN1_read_bio(d2i_of_void *d2i, const char *name, BIO *bp, void **x,
|
|
pem_password_cb *cb, void *u)
|
|
{
|
|
const unsigned char *p = NULL;
|
|
unsigned char *data = NULL;
|
|
long len;
|
|
char *ret = NULL;
|
|
|
|
if (!PEM_bytes_read_bio(&data, &len, NULL, name, bp, cb, u))
|
|
return NULL;
|
|
p = data;
|
|
ret = d2i(x, &p, len);
|
|
if (ret == NULL)
|
|
PEMerr(PEM_F_PEM_ASN1_READ_BIO, ERR_R_ASN1_LIB);
|
|
OPENSSL_free(data);
|
|
return ret;
|
|
}
|