diff options
| author | tb <> | 2023-11-09 08:20:10 +0000 |
|---|---|---|
| committer | tb <> | 2023-11-09 08:20:10 +0000 |
| commit | 8971cd29872eb39b36b3eebd20ec60aa15b2c2b0 (patch) | |
| tree | 971e5344c6110ea276ee1cd6ce0703d6d825c5af /src/lib/libc | |
| parent | 91681bb03ab354868d41ee07ebe76ac34350119e (diff) | |
| download | openbsd-8971cd29872eb39b36b3eebd20ec60aa15b2c2b0.tar.gz openbsd-8971cd29872eb39b36b3eebd20ec60aa15b2c2b0.tar.bz2 openbsd-8971cd29872eb39b36b3eebd20ec60aa15b2c2b0.zip | |
Use X509_ALGOR_set0_by_nid() in rsa_mgf1md_to_maskGenAlgorithm()
ok jsing
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libcrypto/rsa/rsa_ameth.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/lib/libcrypto/rsa/rsa_ameth.c b/src/lib/libcrypto/rsa/rsa_ameth.c index b5e96be61c..46681c6348 100644 --- a/src/lib/libcrypto/rsa/rsa_ameth.c +++ b/src/lib/libcrypto/rsa/rsa_ameth.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: rsa_ameth.c,v 1.49 2023/11/08 19:30:38 tb Exp $ */ | 1 | /* $OpenBSD: rsa_ameth.c,v 1.50 2023/11/09 08:20:10 tb Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 2006. | 3 | * project 2006. |
| 4 | */ | 4 | */ |
| @@ -616,7 +616,6 @@ rsa_mgf1md_to_maskGenAlgorithm(const EVP_MD *mgf1md, X509_ALGOR **out_alg) | |||
| 616 | X509_ALGOR *alg = NULL; | 616 | X509_ALGOR *alg = NULL; |
| 617 | X509_ALGOR *inner_alg = NULL; | 617 | X509_ALGOR *inner_alg = NULL; |
| 618 | ASN1_STRING *astr = NULL; | 618 | ASN1_STRING *astr = NULL; |
| 619 | ASN1_OBJECT *aobj; | ||
| 620 | int ret = 0; | 619 | int ret = 0; |
| 621 | 620 | ||
| 622 | X509_ALGOR_free(*out_alg); | 621 | X509_ALGOR_free(*out_alg); |
| @@ -634,9 +633,7 @@ rsa_mgf1md_to_maskGenAlgorithm(const EVP_MD *mgf1md, X509_ALGOR **out_alg) | |||
| 634 | 633 | ||
| 635 | if ((alg = X509_ALGOR_new()) == NULL) | 634 | if ((alg = X509_ALGOR_new()) == NULL) |
| 636 | goto err; | 635 | goto err; |
| 637 | if ((aobj = OBJ_nid2obj(NID_mgf1)) == NULL) | 636 | if (!X509_ALGOR_set0_by_nid(alg, NID_mgf1, V_ASN1_SEQUENCE, astr)) |
| 638 | goto err; | ||
| 639 | if (!X509_ALGOR_set0(alg, aobj, V_ASN1_SEQUENCE, astr)) | ||
| 640 | goto err; | 637 | goto err; |
| 641 | astr = NULL; | 638 | astr = NULL; |
| 642 | 639 | ||
