projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Modify OBJ_nid2sn(OBJ_obj2nid(...)) occurences to use OBJ_obj2txt()
[openssl.git]
/
crypto
/
cms
/
cms_pwri.c
diff --git
a/crypto/cms/cms_pwri.c
b/crypto/cms/cms_pwri.c
index cea1e404c036ff1c151a0d4b3b5d550847ef6ab2..a27828056379ffdbd0528c755a8fe730e8a8aee1 100644
(file)
--- a/
crypto/cms/cms_pwri.c
+++ b/
crypto/cms/cms_pwri.c
@@
-15,8
+15,9
@@
#include <openssl/cms.h>
#include <openssl/rand.h>
#include <openssl/aes.h>
#include <openssl/cms.h>
#include <openssl/rand.h>
#include <openssl/aes.h>
-#include "
cms_local
.h"
+#include "
internal/sizes
.h"
#include "crypto/asn1.h"
#include "crypto/asn1.h"
+#include "cms_local.h"
int CMS_RecipientInfo_set0_password(CMS_RecipientInfo *ri,
unsigned char *pass, ossl_ssize_t passlen)
int CMS_RecipientInfo_set0_password(CMS_RecipientInfo *ri,
unsigned char *pass, ossl_ssize_t passlen)
@@
-286,7
+287,7
@@
int ossl_cms_RecipientInfo_pwri_crypt(const CMS_ContentInfo *cms,
int r = 0;
X509_ALGOR *algtmp, *kekalg = NULL;
EVP_CIPHER_CTX *kekctx = NULL;
int r = 0;
X509_ALGOR *algtmp, *kekalg = NULL;
EVP_CIPHER_CTX *kekctx = NULL;
- c
onst char *name
;
+ c
har name[OSSL_MAX_NAME_SIZE]
;
EVP_CIPHER *kekcipher;
unsigned char *key = NULL;
size_t keylen;
EVP_CIPHER *kekcipher;
unsigned char *key = NULL;
size_t keylen;
@@
-315,7
+316,7
@@
int ossl_cms_RecipientInfo_pwri_crypt(const CMS_ContentInfo *cms,
return 0;
}
return 0;
}
-
name = OBJ_nid2sn(OBJ_obj2nid(kekalg->algorithm)
);
+
OBJ_obj2txt(name, sizeof(name), kekalg->algorithm, 0
);
kekcipher = EVP_CIPHER_fetch(ossl_cms_ctx_get0_libctx(cms_ctx), name,
ossl_cms_ctx_get0_propq(cms_ctx));
kekcipher = EVP_CIPHER_fetch(ossl_cms_ctx_get0_libctx(cms_ctx), name,
ossl_cms_ctx_get0_propq(cms_ctx));