summaryrefslogtreecommitdiffstats
path: root/lib/libcrypto/asn1/x_algor.c
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2012-10-13 21:25:05 +0000
committerdjm <djm@openbsd.org>2012-10-13 21:25:05 +0000
commit5cdd308e23c573f20580c33373ebbd6aaf46ca93 (patch)
tree8c9c6577606b3e2a4f852b80db635caddf559533 /lib/libcrypto/asn1/x_algor.c
parentimport OpenSSL-1.0.1c (diff)
downloadwireguard-openbsd-5cdd308e23c573f20580c33373ebbd6aaf46ca93.tar.xz
wireguard-openbsd-5cdd308e23c573f20580c33373ebbd6aaf46ca93.zip
resolve conflicts
Diffstat (limited to 'lib/libcrypto/asn1/x_algor.c')
-rw-r--r--lib/libcrypto/asn1/x_algor.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/lib/libcrypto/asn1/x_algor.c b/lib/libcrypto/asn1/x_algor.c
index 99e53429b79..274e456c738 100644
--- a/lib/libcrypto/asn1/x_algor.c
+++ b/lib/libcrypto/asn1/x_algor.c
@@ -128,3 +128,17 @@ void X509_ALGOR_get0(ASN1_OBJECT **paobj, int *pptype, void **ppval,
}
}
+/* Set up an X509_ALGOR DigestAlgorithmIdentifier from an EVP_MD */
+
+void X509_ALGOR_set_md(X509_ALGOR *alg, const EVP_MD *md)
+ {
+ int param_type;
+
+ if (md->flags & EVP_MD_FLAG_DIGALGID_ABSENT)
+ param_type = V_ASN1_UNDEF;
+ else
+ param_type = V_ASN1_NULL;
+
+ X509_ALGOR_set0(alg, OBJ_nid2obj(EVP_MD_type(md)), param_type, NULL);
+
+ }