aboutsummaryrefslogtreecommitdiff
path: root/openssl/crypto/asn1/x_algor.c
diff options
context:
space:
mode:
authorMike DePaulo <mikedep333@gmail.com>2015-01-10 12:26:41 -0500
committerMike DePaulo <mikedep333@gmail.com>2015-01-10 13:07:24 -0500
commit4668cbfa14460fbead98ec3a904a58df1f41c4c3 (patch)
tree72b1fec2e5bfb8ea8ffad514d923c65e9ef38135 /openssl/crypto/asn1/x_algor.c
parent15915c262c1334282d0ab2a3fdb2c416e91b51cf (diff)
downloadvcxsrv-4668cbfa14460fbead98ec3a904a58df1f41c4c3.tar.gz
vcxsrv-4668cbfa14460fbead98ec3a904a58df1f41c4c3.tar.bz2
vcxsrv-4668cbfa14460fbead98ec3a904a58df1f41c4c3.zip
Update openssl to version openssl-1.0.1k
Conflicts: openssl/Makefile
Diffstat (limited to 'openssl/crypto/asn1/x_algor.c')
-rw-r--r--openssl/crypto/asn1/x_algor.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/openssl/crypto/asn1/x_algor.c b/openssl/crypto/asn1/x_algor.c
index 274e456c7..57cc956c2 100644
--- a/openssl/crypto/asn1/x_algor.c
+++ b/openssl/crypto/asn1/x_algor.c
@@ -142,3 +142,14 @@ void X509_ALGOR_set_md(X509_ALGOR *alg, const EVP_MD *md)
X509_ALGOR_set0(alg, OBJ_nid2obj(EVP_MD_type(md)), param_type, NULL);
}
+
+int X509_ALGOR_cmp(const X509_ALGOR *a, const X509_ALGOR *b)
+ {
+ int rv;
+ rv = OBJ_cmp(a->algorithm, b->algorithm);
+ if (rv)
+ return rv;
+ if (!a->parameter && !b->parameter)
+ return 0;
+ return ASN1_TYPE_cmp(a->parameter, b->parameter);
+ }