diff options
| author |   jsing <jsing@openbsd.org> | 2015-02-10 06:36:30 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2015-02-10 06:36:30 +0000 |
| commit | 28df18f0e6905214b0823f1178f3fe018beda150 (patch) | |
| tree | 39ade6ff3b61be8b475a0f0d310584b55b5472f9 /lib/libssl/src | |
| parent | remove some very MD debug code that was reaching into x86 mplocks (diff) | |
| download | wireguard-openbsd-28df18f0e6905214b0823f1178f3fe018beda150.tar.xz wireguard-openbsd-28df18f0e6905214b0823f1178f3fe018beda150.zip | |
Expand IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname macros that got missed.
Diffstat (limited to 'lib/libssl/src')
| -rw-r--r-- | lib/libssl/src/crypto/asn1/x_algor.c | 16 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/asn1/x_exten.c | 16 |
2 files changed, 28 insertions, 4 deletions
diff --git a/lib/libssl/src/crypto/asn1/x_algor.c b/lib/libssl/src/crypto/asn1/x_algor.c index 7768c27eeab..f11a49faf45 100644 --- a/lib/libssl/src/crypto/asn1/x_algor.c +++ b/lib/libssl/src/crypto/asn1/x_algor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x_algor.c,v 1.16 2015/02/10 05:25:45 jsing Exp $ */ +/* $OpenBSD: x_algor.c,v 1.17 2015/02/10 06:36:30 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2000. */ @@ -95,7 +95,19 @@ X509_ALGOR_free(X509_ALGOR *a) { ASN1_item_free((ASN1_VALUE *)a, &X509_ALGOR_it); } -IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(X509_ALGORS, X509_ALGORS, X509_ALGORS) + +X509_ALGORS * +d2i_X509_ALGORS(X509_ALGORS **a, const unsigned char **in, long len) +{ + return (X509_ALGORS *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, + &X509_ALGORS_it); +} + +int +i2d_X509_ALGORS(X509_ALGORS *a, unsigned char **out) +{ + return ASN1_item_i2d((ASN1_VALUE *)a, out, &X509_ALGORS_it); +} X509_ALGOR * X509_ALGOR_dup(X509_ALGOR *x) diff --git a/lib/libssl/src/crypto/asn1/x_exten.c b/lib/libssl/src/crypto/asn1/x_exten.c index f0ec29ea4f9..755faebeba5 100644 --- a/lib/libssl/src/crypto/asn1/x_exten.c +++ b/lib/libssl/src/crypto/asn1/x_exten.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x_exten.c,v 1.12 2015/02/10 05:25:45 jsing Exp $ */ +/* $OpenBSD: x_exten.c,v 1.13 2015/02/10 06:36:30 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2000. */ @@ -96,7 +96,19 @@ X509_EXTENSION_free(X509_EXTENSION *a) { ASN1_item_free((ASN1_VALUE *)a, &X509_EXTENSION_it); } -IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(X509_EXTENSIONS, X509_EXTENSIONS, X509_EXTENSIONS) + +X509_EXTENSIONS * +d2i_X509_EXTENSIONS(X509_EXTENSIONS **a, const unsigned char **in, long len) +{ + return (X509_EXTENSIONS *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, + &X509_EXTENSIONS_it); +} + +int +i2d_X509_EXTENSIONS(X509_EXTENSIONS *a, unsigned char **out) +{ + return ASN1_item_i2d((ASN1_VALUE *)a, out, &X509_EXTENSIONS_it); +} X509_EXTENSION * X509_EXTENSION_dup(X509_EXTENSION *x) |