diff options
| author |   beck <beck@openbsd.org> | 2000-03-19 11:07:35 +0000 |
|---|---|---|
| committer | beck <beck@openbsd.org> | 2000-03-19 11:07:35 +0000 |
| commit | ba5406e9b35230c537ab6fcb7b2fb173a1cea3c3 (patch) | |
| tree | a7183e186150526f5c72717dac37cdabf1b43e51 /lib/libcrypto/asn1/a_bitstr.c | |
| parent | Allow environment variables on command/config lines; markk@knigma.org (diff) | |
| download | wireguard-openbsd-ba5406e9b35230c537ab6fcb7b2fb173a1cea3c3.tar.xz wireguard-openbsd-ba5406e9b35230c537ab6fcb7b2fb173a1cea3c3.zip | |
OpenSSL 0.9.5 merge
*warning* this bumps shared lib minors for libssl and libcrypto from 2.1 to 2.2
if you are using the ssl26 packages for ssh and other things to work you will
need to get new ones (see ~beck/libsslsnap/<arch>) on cvs or ~beck/src-patent.tar.gz on cvs
Diffstat (limited to 'lib/libcrypto/asn1/a_bitstr.c')
| -rw-r--r-- | lib/libcrypto/asn1/a_bitstr.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/lib/libcrypto/asn1/a_bitstr.c b/lib/libcrypto/asn1/a_bitstr.c index 38ea802be81..c77456b315b 100644 --- a/lib/libcrypto/asn1/a_bitstr.c +++ b/lib/libcrypto/asn1/a_bitstr.c @@ -60,6 +60,15 @@ #include "cryptlib.h" #include <openssl/asn1.h> +ASN1_BIT_STRING *ASN1_BIT_STRING_new(void) +{ return M_ASN1_BIT_STRING_new(); } + +void ASN1_BIT_STRING_free(ASN1_BIT_STRING *x) +{ M_ASN1_BIT_STRING_free(x); } + +int ASN1_BIT_STRING_set(ASN1_BIT_STRING *x, unsigned char *d, int len) +{ return M_ASN1_BIT_STRING_set(x, d, len); } + int i2d_ASN1_BIT_STRING(ASN1_BIT_STRING *a, unsigned char **pp) { int ret,j,r,bits,len; @@ -121,7 +130,7 @@ ASN1_BIT_STRING *d2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a, unsigned char **pp, if ((a == NULL) || ((*a) == NULL)) { - if ((ret=ASN1_BIT_STRING_new()) == NULL) return(NULL); + if ((ret=M_ASN1_BIT_STRING_new()) == NULL) return(NULL); } else ret=(*a); @@ -164,7 +173,7 @@ ASN1_BIT_STRING *d2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a, unsigned char **pp, s=NULL; ret->length=(int)len; - if (ret->data != NULL) Free((char *)ret->data); + if (ret->data != NULL) Free(ret->data); ret->data=s; ret->type=V_ASN1_BIT_STRING; if (a != NULL) (*a)=ret; @@ -173,7 +182,7 @@ ASN1_BIT_STRING *d2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a, unsigned char **pp, err: ASN1err(ASN1_F_D2I_ASN1_BIT_STRING,i); if ((ret != NULL) && ((a == NULL) || (*a != ret))) - ASN1_BIT_STRING_free(ret); + M_ASN1_BIT_STRING_free(ret); return(NULL); } |