17ebf85abd
Deprecate the function ASN1_STRING_data() and replace with a new function ASN1_STRING_get0_data() which returns a constant pointer. Update library to use new function. Reviewed-by: Rich Salz <rsalz@openssl.org>
115 lines
2.9 KiB
C
115 lines
2.9 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/asn1.h>
|
|
#include <openssl/asn1t.h>
|
|
|
|
int ASN1_TYPE_set_octetstring(ASN1_TYPE *a, unsigned char *data, int len)
|
|
{
|
|
ASN1_STRING *os;
|
|
|
|
if ((os = ASN1_OCTET_STRING_new()) == NULL)
|
|
return (0);
|
|
if (!ASN1_OCTET_STRING_set(os, data, len)) {
|
|
ASN1_OCTET_STRING_free(os);
|
|
return 0;
|
|
}
|
|
ASN1_TYPE_set(a, V_ASN1_OCTET_STRING, os);
|
|
return (1);
|
|
}
|
|
|
|
/* int max_len: for returned value */
|
|
int ASN1_TYPE_get_octetstring(const ASN1_TYPE *a, unsigned char *data, int max_len)
|
|
{
|
|
int ret, num;
|
|
const unsigned char *p;
|
|
|
|
if ((a->type != V_ASN1_OCTET_STRING) || (a->value.octet_string == NULL)) {
|
|
ASN1err(ASN1_F_ASN1_TYPE_GET_OCTETSTRING, ASN1_R_DATA_IS_WRONG);
|
|
return (-1);
|
|
}
|
|
p = ASN1_STRING_get0_data(a->value.octet_string);
|
|
ret = ASN1_STRING_length(a->value.octet_string);
|
|
if (ret < max_len)
|
|
num = ret;
|
|
else
|
|
num = max_len;
|
|
memcpy(data, p, num);
|
|
return (ret);
|
|
}
|
|
|
|
typedef struct {
|
|
long num;
|
|
ASN1_OCTET_STRING *oct;
|
|
} asn1_int_oct;
|
|
|
|
ASN1_SEQUENCE(asn1_int_oct) = {
|
|
ASN1_SIMPLE(asn1_int_oct, num, LONG),
|
|
ASN1_SIMPLE(asn1_int_oct, oct, ASN1_OCTET_STRING)
|
|
} static_ASN1_SEQUENCE_END(asn1_int_oct)
|
|
|
|
DECLARE_ASN1_ITEM(asn1_int_oct)
|
|
|
|
int ASN1_TYPE_set_int_octetstring(ASN1_TYPE *a, long num, unsigned char *data,
|
|
int len)
|
|
{
|
|
asn1_int_oct atmp;
|
|
ASN1_OCTET_STRING oct;
|
|
|
|
atmp.num = num;
|
|
atmp.oct = &oct;
|
|
oct.data = data;
|
|
oct.type = V_ASN1_OCTET_STRING;
|
|
oct.length = len;
|
|
oct.flags = 0;
|
|
|
|
if (ASN1_TYPE_pack_sequence(ASN1_ITEM_rptr(asn1_int_oct), &atmp, &a))
|
|
return 1;
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* we return the actual length...
|
|
*/
|
|
/* int max_len: for returned value */
|
|
int ASN1_TYPE_get_int_octetstring(const ASN1_TYPE *a, long *num,
|
|
unsigned char *data, int max_len)
|
|
{
|
|
asn1_int_oct *atmp = NULL;
|
|
int ret = -1, n;
|
|
|
|
if ((a->type != V_ASN1_SEQUENCE) || (a->value.sequence == NULL)) {
|
|
goto err;
|
|
}
|
|
|
|
atmp = ASN1_TYPE_unpack_sequence(ASN1_ITEM_rptr(asn1_int_oct), a);
|
|
|
|
if (atmp == NULL)
|
|
goto err;
|
|
|
|
if (num != NULL)
|
|
*num = atmp->num;
|
|
|
|
ret = ASN1_STRING_length(atmp->oct);
|
|
if (max_len > ret)
|
|
n = ret;
|
|
else
|
|
n = max_len;
|
|
|
|
if (data != NULL)
|
|
memcpy(data, ASN1_STRING_get0_data(atmp->oct), n);
|
|
if (ret == -1) {
|
|
err:
|
|
ASN1err(ASN1_F_ASN1_TYPE_GET_INT_OCTETSTRING, ASN1_R_DATA_IS_WRONG);
|
|
}
|
|
M_ASN1_free_of(atmp, asn1_int_oct);
|
|
return ret;
|
|
}
|