wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename functions for new convention.

Browse source
This commit is contained in:
Dr. Stephen Henson 2000-02-26 01:55:33 +00:00
parent 47c177c7b3
commit c7cb16a8ff
25 changed files with 131 additions and 128 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -4,6 +4,9 @@
Changes between 0.9.4 and 0.9.5 [xx XXX 2000] Changes between 0.9.4 and 0.9.5 [xx XXX 2000]
*) Change function names to the new naming convention.
[Steve Henson]
*) Allow for the possibility of temp RSA key generation failure: *) Allow for the possibility of temp RSA key generation failure:
the code used to assume it always worked and crashed on failure. the code used to assume it always worked and crashed on failure.
[Steve Henson] [Steve Henson]

2
apps/pkcs12.c
View file

@ -693,7 +693,7 @@ int get_cert_chain (X509 *cert, STACK_OF(X509) **chain)
i = X509_STORE_CTX_get_error (&store_ctx); i = X509_STORE_CTX_get_error (&store_ctx);
goto err; goto err;
} }
chn = X509_STORE_CTX_rget_chain(&store_ctx); chn = X509_STORE_CTX_get1_chain(&store_ctx);
i = 0; i = 0;
*chain = chn; *chain = chn;
err: err:

4
apps/req.c
View file

@ -1103,7 +1103,7 @@ static int auto_info(X509_REQ *req, STACK_OF(CONF_VALUE) *dn_sk,
for (i = 0; i < sk_CONF_VALUE_num(attr_sk); i++) for (i = 0; i < sk_CONF_VALUE_num(attr_sk); i++)
{ {
v=sk_CONF_VALUE_value(attr_sk,i); v=sk_CONF_VALUE_value(attr_sk,i);
if(!X509_REQ_radd_attr_by_txt(req, v->name, MBSTRING_ASC, if(!X509_REQ_add1_attr_by_txt(req, v->name, MBSTRING_ASC,
(unsigned char *)v->value, -1)) return 0; (unsigned char *)v->value, -1)) return 0;
} }
} }
@ -1201,7 +1201,7 @@ start:
buf[--i]='\0'; buf[--i]='\0';
if(!req_check_len(i, min, max)) goto start; if(!req_check_len(i, min, max)) goto start;
if(!X509_REQ_radd_attr_by_NID(req, nid, MBSTRING_ASC, if(!X509_REQ_add1_attr_by_NID(req, nid, MBSTRING_ASC,
(unsigned char *)buf, -1)) { (unsigned char *)buf, -1)) {
BIO_printf(bio_err, "Error adding attribute\n"); BIO_printf(bio_err, "Error adding attribute\n");
ERR_print_errors(bio_err); ERR_print_errors(bio_err);

4
apps/smime.c
View file

@ -488,9 +488,9 @@ int MAIN(int argc, char **argv)
} }
#ifdef CRYPTO_MDEBUG #ifdef CRYPTO_MDEBUG
CRYPTO_pop_info(); CRYPTO_pop_info();
CRYPTO_push_info("PKCS7_iget_signers"); CRYPTO_push_info("PKCS7_get0_signers");
#endif #endif
signers = PKCS7_iget_signers(p7, other, flags); signers = PKCS7_get0_signers(p7, other, flags);
#ifdef CRYPTO_MDEBUG #ifdef CRYPTO_MDEBUG
CRYPTO_pop_info(); CRYPTO_pop_info();
CRYPTO_push_info("save_certs"); CRYPTO_push_info("save_certs");

4
apps/verify.c
View file

@ -191,8 +191,8 @@ end:
for(i = 0; i < X509_PURPOSE_get_count(); i++) { for(i = 0; i < X509_PURPOSE_get_count(); i++) {
X509_PURPOSE *ptmp; X509_PURPOSE *ptmp;
ptmp = X509_PURPOSE_iget(i); ptmp = X509_PURPOSE_iget(i);
BIO_printf(bio_err, "\t%-10s\t%s\n", X509_PURPOSE_iget_sname(ptmp), BIO_printf(bio_err, "\t%-10s\t%s\n", X509_PURPOSE_get0_sname(ptmp),
X509_PURPOSE_iget_name(ptmp)); X509_PURPOSE_get0_name(ptmp));
} }
} }
if (cert_ctx != NULL) X509_STORE_free(cert_ctx); if (cert_ctx != NULL) X509_STORE_free(cert_ctx);

6
apps/x509.c
View file

@ -563,14 +563,14 @@ bad:
if(trust) { if(trust) {
for(i = 0; i < sk_ASN1_OBJECT_num(trust); i++) { for(i = 0; i < sk_ASN1_OBJECT_num(trust); i++) {
objtmp = sk_ASN1_OBJECT_value(trust, i); objtmp = sk_ASN1_OBJECT_value(trust, i);
X509_radd_trust_object(x, objtmp); X509_add1_trust_object(x, objtmp);
} }
} }
if(reject) { if(reject) {
for(i = 0; i < sk_ASN1_OBJECT_num(reject); i++) { for(i = 0; i < sk_ASN1_OBJECT_num(reject); i++) {
objtmp = sk_ASN1_OBJECT_value(reject, i); objtmp = sk_ASN1_OBJECT_value(reject, i);
X509_radd_reject_object(x, objtmp); X509_add1_reject_object(x, objtmp);
} }
} }
@ -1235,7 +1235,7 @@ static int purpose_print(BIO *bio, X509 *cert, X509_PURPOSE *pt)
int id, i, idret; int id, i, idret;
char *pname; char *pname;
id = X509_PURPOSE_get_id(pt); id = X509_PURPOSE_get_id(pt);
pname = X509_PURPOSE_iget_name(pt); pname = X509_PURPOSE_get0_name(pt);
for(i = 0; i < 2; i++) { for(i = 0; i < 2; i++) {
idret = X509_check_purpose(cert, id, i); idret = X509_check_purpose(cert, id, i);
BIO_printf(bio, "%s%s : ", pname, i ? " CA" : ""); BIO_printf(bio, "%s%s : ", pname, i ? " CA" : "");

8
crypto/asn1/x_pubkey.c
View file

@ -297,7 +297,7 @@ RSA *d2i_RSA_PUBKEY(RSA **a, unsigned char **pp,
q = *pp; q = *pp;
pkey = d2i_PUBKEY(NULL, &q, length); pkey = d2i_PUBKEY(NULL, &q, length);
if(!pkey) return NULL; if(!pkey) return NULL;
key = EVP_PKEY_rget_RSA(pkey); key = EVP_PKEY_get1_RSA(pkey);
EVP_PKEY_free(pkey); EVP_PKEY_free(pkey);
if(!key) return NULL; if(!key) return NULL;
*pp = q; *pp = q;
@ -318,7 +318,7 @@ int i2d_RSA_PUBKEY(RSA *a, unsigned char **pp)
ASN1err(ASN1_F_I2D_RSA_PUBKEY, ERR_R_MALLOC_FAILURE); ASN1err(ASN1_F_I2D_RSA_PUBKEY, ERR_R_MALLOC_FAILURE);
return 0; return 0;
} }
EVP_PKEY_rset_RSA(pktmp, a); EVP_PKEY_set1_RSA(pktmp, a);
ret = i2d_PUBKEY(pktmp, pp); ret = i2d_PUBKEY(pktmp, pp);
EVP_PKEY_free(pktmp); EVP_PKEY_free(pktmp);
return ret; return ret;
@ -335,7 +335,7 @@ DSA *d2i_DSA_PUBKEY(DSA **a, unsigned char **pp,
q = *pp; q = *pp;
pkey = d2i_PUBKEY(NULL, &q, length); pkey = d2i_PUBKEY(NULL, &q, length);
if(!pkey) return NULL; if(!pkey) return NULL;
key = EVP_PKEY_rget_DSA(pkey); key = EVP_PKEY_get1_DSA(pkey);
EVP_PKEY_free(pkey); EVP_PKEY_free(pkey);
if(!key) return NULL; if(!key) return NULL;
*pp = q; *pp = q;
@ -356,7 +356,7 @@ int i2d_DSA_PUBKEY(DSA *a, unsigned char **pp)
ASN1err(ASN1_F_I2D_DSA_PUBKEY, ERR_R_MALLOC_FAILURE); ASN1err(ASN1_F_I2D_DSA_PUBKEY, ERR_R_MALLOC_FAILURE);
return 0; return 0;
} }
EVP_PKEY_rset_DSA(pktmp, a); EVP_PKEY_set1_DSA(pktmp, a);
ret = i2d_PUBKEY(pktmp, pp); ret = i2d_PUBKEY(pktmp, pp);
EVP_PKEY_free(pktmp); EVP_PKEY_free(pktmp);
return ret; return ret;

4
crypto/asn1/x_x509a.c
View file

@ -160,7 +160,7 @@ unsigned char *X509_alias_iget(X509 *x, int *len)
return x->aux->alias->data; return x->aux->alias->data;
} }
int X509_radd_trust_object(X509 *x, ASN1_OBJECT *obj) int X509_add1_trust_object(X509 *x, ASN1_OBJECT *obj)
{ {
X509_CERT_AUX *aux; X509_CERT_AUX *aux;
ASN1_OBJECT *objtmp; ASN1_OBJECT *objtmp;
@ -171,7 +171,7 @@ int X509_radd_trust_object(X509 *x, ASN1_OBJECT *obj)
return sk_ASN1_OBJECT_push(aux->trust, objtmp); return sk_ASN1_OBJECT_push(aux->trust, objtmp);
} }
int X509_radd_reject_object(X509 *x, ASN1_OBJECT *obj) int X509_add1_reject_object(X509 *x, ASN1_OBJECT *obj)
{ {
X509_CERT_AUX *aux; X509_CERT_AUX *aux;
ASN1_OBJECT *objtmp; ASN1_OBJECT *objtmp;

18
crypto/evp/evp.h
View file

@ -617,16 +617,16 @@ int EVP_PKEY_bits(EVP_PKEY *pkey);
int EVP_PKEY_size(EVP_PKEY *pkey); int EVP_PKEY_size(EVP_PKEY *pkey);
int EVP_PKEY_assign(EVP_PKEY *pkey,int type,char *key); int EVP_PKEY_assign(EVP_PKEY *pkey,int type,char *key);
#ifndef NO_RSA #ifndef NO_RSA
int EVP_PKEY_rset_RSA(EVP_PKEY *pkey,RSA *key); int EVP_PKEY_set1_RSA(EVP_PKEY *pkey,RSA *key);
RSA * EVP_PKEY_rget_RSA(EVP_PKEY *pkey); RSA * EVP_PKEY_get1_RSA(EVP_PKEY *pkey);
#endif #endif
#ifndef NO_DSA #ifndef NO_DSA
int EVP_PKEY_rset_DSA(EVP_PKEY *pkey,DSA *key); int EVP_PKEY_set1_DSA(EVP_PKEY *pkey,DSA *key);
DSA * EVP_PKEY_rget_DSA(EVP_PKEY *pkey); DSA * EVP_PKEY_get1_DSA(EVP_PKEY *pkey);
#endif #endif
#ifndef NO_DH #ifndef NO_DH
int EVP_PKEY_rset_DH(EVP_PKEY *pkey,DH *key); int EVP_PKEY_set1_DH(EVP_PKEY *pkey,DH *key);
DH * EVP_PKEY_rget_DH(EVP_PKEY *pkey); DH * EVP_PKEY_get1_DH(EVP_PKEY *pkey);
#endif #endif
EVP_PKEY * EVP_PKEY_new(void); EVP_PKEY * EVP_PKEY_new(void);
void EVP_PKEY_free(EVP_PKEY *pkey); void EVP_PKEY_free(EVP_PKEY *pkey);
@ -695,9 +695,9 @@ void EVP_PBE_cleanup(void);
#define EVP_F_EVP_PKEY_DECRYPT 104 #define EVP_F_EVP_PKEY_DECRYPT 104
#define EVP_F_EVP_PKEY_ENCRYPT 105 #define EVP_F_EVP_PKEY_ENCRYPT 105
#define EVP_F_EVP_PKEY_NEW 106 #define EVP_F_EVP_PKEY_NEW 106
#define EVP_F_EVP_PKEY_RGET_DH 119 #define EVP_F_EVP_PKEY_GET1_DH 119
#define EVP_F_EVP_PKEY_RGET_DSA 120 #define EVP_F_EVP_PKEY_GET1_DSA 120
#define EVP_F_EVP_PKEY_RGET_RSA 121 #define EVP_F_EVP_PKEY_GET1_RSA 121
#define EVP_F_EVP_SIGNFINAL 107 #define EVP_F_EVP_SIGNFINAL 107
#define EVP_F_EVP_VERIFYFINAL 108 #define EVP_F_EVP_VERIFYFINAL 108
#define EVP_F_PKCS5_PBE_KEYIVGEN 117 #define EVP_F_PKCS5_PBE_KEYIVGEN 117

6
crypto/evp/evp_err.c
View file

@ -78,9 +78,9 @@ static ERR_STRING_DATA EVP_str_functs[]=
{ERR_PACK(0,EVP_F_EVP_PKEY_DECRYPT,0), "EVP_PKEY_decrypt"}, {ERR_PACK(0,EVP_F_EVP_PKEY_DECRYPT,0), "EVP_PKEY_decrypt"},
{ERR_PACK(0,EVP_F_EVP_PKEY_ENCRYPT,0), "EVP_PKEY_encrypt"}, {ERR_PACK(0,EVP_F_EVP_PKEY_ENCRYPT,0), "EVP_PKEY_encrypt"},
{ERR_PACK(0,EVP_F_EVP_PKEY_NEW,0), "EVP_PKEY_new"}, {ERR_PACK(0,EVP_F_EVP_PKEY_NEW,0), "EVP_PKEY_new"},
{ERR_PACK(0,EVP_F_EVP_PKEY_RGET_DH,0), "EVP_PKEY_rget_DH"}, {ERR_PACK(0,EVP_F_EVP_PKEY_GET1_DH,0), "EVP_PKEY_get1_DH"},
{ERR_PACK(0,EVP_F_EVP_PKEY_RGET_DSA,0), "EVP_PKEY_rget_DSA"}, {ERR_PACK(0,EVP_F_EVP_PKEY_GET1_DSA,0), "EVP_PKEY_get1_DSA"},
{ERR_PACK(0,EVP_F_EVP_PKEY_RGET_RSA,0), "EVP_PKEY_rget_RSA"}, {ERR_PACK(0,EVP_F_EVP_PKEY_GET1_RSA,0), "EVP_PKEY_get1_RSA"},
{ERR_PACK(0,EVP_F_EVP_SIGNFINAL,0), "EVP_SignFinal"}, {ERR_PACK(0,EVP_F_EVP_SIGNFINAL,0), "EVP_SignFinal"},
{ERR_PACK(0,EVP_F_EVP_VERIFYFINAL,0), "EVP_VerifyFinal"}, {ERR_PACK(0,EVP_F_EVP_VERIFYFINAL,0), "EVP_VerifyFinal"},
{ERR_PACK(0,EVP_F_PKCS5_PBE_KEYIVGEN,0), "PKCS5_PBE_keyivgen"}, {ERR_PACK(0,EVP_F_PKCS5_PBE_KEYIVGEN,0), "PKCS5_PBE_keyivgen"},

18
crypto/evp/p_lib.c
View file

@ -206,17 +206,17 @@ int EVP_PKEY_assign(EVP_PKEY *pkey, int type, char *key)
} }
#ifndef NO_RSA #ifndef NO_RSA
int EVP_PKEY_rset_RSA(EVP_PKEY *pkey, RSA *key) int EVP_PKEY_set1_RSA(EVP_PKEY *pkey, RSA *key)
{ {
int ret = EVP_PKEY_assign_RSA(pkey, key); int ret = EVP_PKEY_assign_RSA(pkey, key);
if(ret) CRYPTO_add(&key->references, 1, CRYPTO_LOCK_RSA); if(ret) CRYPTO_add(&key->references, 1, CRYPTO_LOCK_RSA);
return ret; return ret;
} }
RSA *EVP_PKEY_rget_RSA(EVP_PKEY *pkey) RSA *EVP_PKEY_get1_RSA(EVP_PKEY *pkey)
{ {
if(pkey->type != EVP_PKEY_RSA) { if(pkey->type != EVP_PKEY_RSA) {
EVPerr(EVP_F_EVP_PKEY_RGET_RSA, EVP_R_EXPECTING_AN_RSA_KEY); EVPerr(EVP_F_EVP_PKEY_GET1_RSA, EVP_R_EXPECTING_AN_RSA_KEY);
return NULL; return NULL;
} }
CRYPTO_add(&pkey->pkey.rsa->references, 1, CRYPTO_LOCK_RSA); CRYPTO_add(&pkey->pkey.rsa->references, 1, CRYPTO_LOCK_RSA);
@ -225,17 +225,17 @@ RSA *EVP_PKEY_rget_RSA(EVP_PKEY *pkey)
#endif #endif
#ifndef NO_DSA #ifndef NO_DSA
int EVP_PKEY_rset_DSA(EVP_PKEY *pkey, DSA *key) int EVP_PKEY_set1_DSA(EVP_PKEY *pkey, DSA *key)
{ {
int ret = EVP_PKEY_assign_DSA(pkey, key); int ret = EVP_PKEY_assign_DSA(pkey, key);
if(ret) CRYPTO_add(&key->references, 1, CRYPTO_LOCK_DSA); if(ret) CRYPTO_add(&key->references, 1, CRYPTO_LOCK_DSA);
return ret; return ret;
} }
DSA *EVP_PKEY_rget_DSA(EVP_PKEY *pkey) DSA *EVP_PKEY_get1_DSA(EVP_PKEY *pkey)
{ {
if(pkey->type != EVP_PKEY_DSA) { if(pkey->type != EVP_PKEY_DSA) {
EVPerr(EVP_F_EVP_PKEY_RGET_DSA, EVP_R_EXPECTING_A_DSA_KEY); EVPerr(EVP_F_EVP_PKEY_GET1_DSA, EVP_R_EXPECTING_A_DSA_KEY);
return NULL; return NULL;
} }
CRYPTO_add(&pkey->pkey.dsa->references, 1, CRYPTO_LOCK_DSA); CRYPTO_add(&pkey->pkey.dsa->references, 1, CRYPTO_LOCK_DSA);
@ -245,17 +245,17 @@ DSA *EVP_PKEY_rget_DSA(EVP_PKEY *pkey)
#ifndef NO_DH #ifndef NO_DH
int EVP_PKEY_rset_DH(EVP_PKEY *pkey, DH *key) int EVP_PKEY_set1_DH(EVP_PKEY *pkey, DH *key)
{ {
int ret = EVP_PKEY_assign_DH(pkey, key); int ret = EVP_PKEY_assign_DH(pkey, key);
if(ret) CRYPTO_add(&key->references, 1, CRYPTO_LOCK_DH); if(ret) CRYPTO_add(&key->references, 1, CRYPTO_LOCK_DH);
return ret; return ret;
} }
DH *EVP_PKEY_rget_DH(EVP_PKEY *pkey) DH *EVP_PKEY_get1_DH(EVP_PKEY *pkey)
{ {
if(pkey->type != EVP_PKEY_DH) { if(pkey->type != EVP_PKEY_DH) {
EVPerr(EVP_F_EVP_PKEY_RGET_DH, EVP_R_EXPECTING_A_DH_KEY); EVPerr(EVP_F_EVP_PKEY_GET1_DH, EVP_R_EXPECTING_A_DH_KEY);
return NULL; return NULL;
} }
CRYPTO_add(&pkey->pkey.dh->references, 1, CRYPTO_LOCK_DH); CRYPTO_add(&pkey->pkey.dh->references, 1, CRYPTO_LOCK_DH);

4
crypto/pem/pem_all.c
View file

@ -105,7 +105,7 @@ static RSA *pkey_get_rsa(EVP_PKEY *key, RSA **rsa)
{ {
RSA *rtmp; RSA *rtmp;
if(!key) return NULL; if(!key) return NULL;
rtmp = EVP_PKEY_rget_RSA(key); rtmp = EVP_PKEY_get1_RSA(key);
EVP_PKEY_free(key); EVP_PKEY_free(key);
if(!rtmp) return NULL; if(!rtmp) return NULL;
if(rsa) { if(rsa) {
@ -147,7 +147,7 @@ static DSA *pkey_get_dsa(EVP_PKEY *key, DSA **dsa)
{ {
DSA *dtmp; DSA *dtmp;
if(!key) return NULL; if(!key) return NULL;
dtmp = EVP_PKEY_rget_DSA(key); dtmp = EVP_PKEY_get1_DSA(key);
EVP_PKEY_free(key); EVP_PKEY_free(key);
if(!dtmp) return NULL; if(!dtmp) return NULL;
if(dsa) { if(dsa) {

14
crypto/pkcs7/pk7_smime.c
View file

@ -184,7 +184,7 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,
} }
signers = PKCS7_iget_signers(p7, certs, flags); signers = PKCS7_get0_signers(p7, certs, flags);
if(!signers) return 0; if(!signers) return 0;
@ -264,7 +264,7 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,
return 0; return 0;
} }
STACK_OF(X509) *PKCS7_iget_signers(PKCS7 *p7, STACK_OF(X509) *certs, int flags) STACK_OF(X509) *PKCS7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs, int flags)
{ {
STACK_OF(X509) *signers; STACK_OF(X509) *signers;
STACK_OF(PKCS7_SIGNER_INFO) *sinfos; STACK_OF(PKCS7_SIGNER_INFO) *sinfos;
@ -274,16 +274,16 @@ STACK_OF(X509) *PKCS7_iget_signers(PKCS7 *p7, STACK_OF(X509) *certs, int flags)
int i; int i;
if(!p7) { if(!p7) {
PKCS7err(PKCS7_F_PKCS7_IGET_SIGNERS,PKCS7_R_INVALID_NULL_POINTER); PKCS7err(PKCS7_F_PKCS7_GET0_SIGNERS,PKCS7_R_INVALID_NULL_POINTER);
return NULL; return NULL;
} }
if(!PKCS7_type_is_signed(p7)) { if(!PKCS7_type_is_signed(p7)) {
PKCS7err(PKCS7_F_PKCS7_IGET_SIGNERS,PKCS7_R_WRONG_CONTENT_TYPE); PKCS7err(PKCS7_F_PKCS7_GET0_SIGNERS,PKCS7_R_WRONG_CONTENT_TYPE);
return NULL; return NULL;
} }
if(!(signers = sk_X509_new(NULL))) { if(!(signers = sk_X509_new(NULL))) {
PKCS7err(PKCS7_F_PKCS7_IGET_SIGNERS,ERR_R_MALLOC_FAILURE); PKCS7err(PKCS7_F_PKCS7_GET0_SIGNERS,ERR_R_MALLOC_FAILURE);
return NULL; return NULL;
} }
@ -292,7 +292,7 @@ STACK_OF(X509) *PKCS7_iget_signers(PKCS7 *p7, STACK_OF(X509) *certs, int flags)
sinfos = PKCS7_get_signer_info(p7); sinfos = PKCS7_get_signer_info(p7);
if(sk_PKCS7_SIGNER_INFO_num(sinfos) <= 0) { if(sk_PKCS7_SIGNER_INFO_num(sinfos) <= 0) {
PKCS7err(PKCS7_F_PKCS7_IGET_SIGNERS,PKCS7_R_NO_SIGNERS); PKCS7err(PKCS7_F_PKCS7_GET0_SIGNERS,PKCS7_R_NO_SIGNERS);
return 0; return 0;
} }
@ -309,7 +309,7 @@ STACK_OF(X509) *PKCS7_iget_signers(PKCS7 *p7, STACK_OF(X509) *certs, int flags)
X509_find_by_issuer_and_serial (p7->d.sign->cert, X509_find_by_issuer_and_serial (p7->d.sign->cert,
ias->issuer, ias->serial); ias->issuer, ias->serial);
if (!signer) { if (!signer) {
PKCS7err(PKCS7_F_PKCS7_IGET_SIGNERS,PKCS7_R_SIGNER_CERTIFICATE_NOT_FOUND); PKCS7err(PKCS7_F_PKCS7_GET0_SIGNERS,PKCS7_R_SIGNER_CERTIFICATE_NOT_FOUND);
sk_X509_free(signers); sk_X509_free(signers);
return 0; return 0;
} }

4
crypto/pkcs7/pkcs7.h
View file

@ -397,7 +397,7 @@ PKCS7 *PKCS7_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs,
BIO *data, int flags); BIO *data, int flags);
int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store, int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,
BIO *indata, BIO *out, int flags); BIO *indata, BIO *out, int flags);
STACK_OF(X509) *PKCS7_iget_signers(PKCS7 *p7, STACK_OF(X509) *certs, int flags); STACK_OF(X509) *PKCS7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs, int flags);
PKCS7 *PKCS7_encrypt(STACK_OF(X509) *certs, BIO *in, EVP_CIPHER *cipher, PKCS7 *PKCS7_encrypt(STACK_OF(X509) *certs, BIO *in, EVP_CIPHER *cipher,
int flags); int flags);
int PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data, int flags); int PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data, int flags);
@ -433,7 +433,7 @@ int SMIME_text(BIO *in, BIO *out);
#define PKCS7_F_PKCS7_DATAVERIFY 107 #define PKCS7_F_PKCS7_DATAVERIFY 107
#define PKCS7_F_PKCS7_DECRYPT 114 #define PKCS7_F_PKCS7_DECRYPT 114
#define PKCS7_F_PKCS7_ENCRYPT 115 #define PKCS7_F_PKCS7_ENCRYPT 115
#define PKCS7_F_PKCS7_IGET_SIGNERS 124 #define PKCS7_F_PKCS7_GET0_SIGNERS 124
#define PKCS7_F_PKCS7_SET_CIPHER 108 #define PKCS7_F_PKCS7_SET_CIPHER 108
#define PKCS7_F_PKCS7_SET_CONTENT 109 #define PKCS7_F_PKCS7_SET_CONTENT 109
#define PKCS7_F_PKCS7_SET_TYPE 110 #define PKCS7_F_PKCS7_SET_TYPE 110

2
crypto/pkcs7/pkcs7err.c
View file

@ -79,7 +79,7 @@ static ERR_STRING_DATA PKCS7_str_functs[]=
{ERR_PACK(0,PKCS7_F_PKCS7_DATAVERIFY,0), "PKCS7_dataVerify"}, {ERR_PACK(0,PKCS7_F_PKCS7_DATAVERIFY,0), "PKCS7_dataVerify"},
{ERR_PACK(0,PKCS7_F_PKCS7_DECRYPT,0), "PKCS7_decrypt"}, {ERR_PACK(0,PKCS7_F_PKCS7_DECRYPT,0), "PKCS7_decrypt"},
{ERR_PACK(0,PKCS7_F_PKCS7_ENCRYPT,0), "PKCS7_encrypt"}, {ERR_PACK(0,PKCS7_F_PKCS7_ENCRYPT,0), "PKCS7_encrypt"},
{ERR_PACK(0,PKCS7_F_PKCS7_IGET_SIGNERS,0), "PKCS7_iget_signers"}, {ERR_PACK(0,PKCS7_F_PKCS7_GET0_SIGNERS,0), "PKCS7_get0_signers"},
{ERR_PACK(0,PKCS7_F_PKCS7_SET_CIPHER,0), "PKCS7_set_cipher"}, {ERR_PACK(0,PKCS7_F_PKCS7_SET_CIPHER,0), "PKCS7_set_cipher"},
{ERR_PACK(0,PKCS7_F_PKCS7_SET_CONTENT,0), "PKCS7_set_content"}, {ERR_PACK(0,PKCS7_F_PKCS7_SET_CONTENT,0), "PKCS7_set_content"},
{ERR_PACK(0,PKCS7_F_PKCS7_SET_TYPE,0), "PKCS7_set_type"}, {ERR_PACK(0,PKCS7_F_PKCS7_SET_TYPE,0), "PKCS7_set_type"},

36
crypto/x509/x509.h
View file

@ -825,8 +825,8 @@ X509_CERT_AUX * d2i_X509_CERT_AUX(X509_CERT_AUX **a,unsigned char **pp,
int X509_alias_rset(X509 *x, unsigned char *name, int len); int X509_alias_rset(X509 *x, unsigned char *name, int len);
unsigned char * X509_alias_iget(X509 *x, int *len); unsigned char * X509_alias_iget(X509 *x, int *len);
int (*X509_TRUST_set_default(int (*trust)(int , X509 *, int)))(int, X509 *, int); int (*X509_TRUST_set_default(int (*trust)(int , X509 *, int)))(int, X509 *, int);
int X509_radd_trust_object(X509 *x, ASN1_OBJECT *obj); int X509_add1_trust_object(X509 *x, ASN1_OBJECT *obj);
int X509_radd_reject_object(X509 *x, ASN1_OBJECT *obj); int X509_add1_reject_object(X509 *x, ASN1_OBJECT *obj);
void X509_trust_clear(X509 *x); void X509_trust_clear(X509 *x);
void X509_reject_clear(X509 *x); void X509_reject_clear(X509 *x);
@ -916,14 +916,14 @@ int X509_REQ_get_attr_by_OBJ(const X509_REQ *req, ASN1_OBJECT *obj,
int lastpos); int lastpos);
X509_ATTRIBUTE *X509_REQ_get_attr(const X509_REQ *req, int loc); X509_ATTRIBUTE *X509_REQ_get_attr(const X509_REQ *req, int loc);
X509_ATTRIBUTE *X509_REQ_delete_attr(X509_REQ *req, int loc); X509_ATTRIBUTE *X509_REQ_delete_attr(X509_REQ *req, int loc);
int X509_REQ_radd_attr(X509_REQ *req, X509_ATTRIBUTE *attr); int X509_REQ_add1_attr(X509_REQ *req, X509_ATTRIBUTE *attr);
int X509_REQ_radd_attr_by_OBJ(X509_REQ *req, int X509_REQ_add1_attr_by_OBJ(X509_REQ *req,
ASN1_OBJECT *obj, int type, ASN1_OBJECT *obj, int type,
unsigned char *bytes, int len); unsigned char *bytes, int len);
int X509_REQ_radd_attr_by_NID(X509_REQ *req, int X509_REQ_add1_attr_by_NID(X509_REQ *req,
int nid, int type, int nid, int type,
unsigned char *bytes, int len); unsigned char *bytes, int len);
int X509_REQ_radd_attr_by_txt(X509_REQ *req, int X509_REQ_add1_attr_by_txt(X509_REQ *req,
char *attrname, int type, char *attrname, int type,
unsigned char *bytes, int len); unsigned char *bytes, int len);
@ -1050,15 +1050,15 @@ int X509at_get_attr_by_OBJ(const STACK_OF(X509_ATTRIBUTE) *sk, ASN1_OBJECT *obj,
int lastpos); int lastpos);
X509_ATTRIBUTE *X509at_get_attr(const STACK_OF(X509_ATTRIBUTE) *x, int loc); X509_ATTRIBUTE *X509at_get_attr(const STACK_OF(X509_ATTRIBUTE) *x, int loc);
X509_ATTRIBUTE *X509at_delete_attr(STACK_OF(X509_ATTRIBUTE) *x, int loc); X509_ATTRIBUTE *X509at_delete_attr(STACK_OF(X509_ATTRIBUTE) *x, int loc);
STACK_OF(X509_ATTRIBUTE) *X509at_radd_attr(STACK_OF(X509_ATTRIBUTE) **x, STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr(STACK_OF(X509_ATTRIBUTE) **x,
X509_ATTRIBUTE *attr); X509_ATTRIBUTE *attr);
STACK_OF(X509_ATTRIBUTE) *X509at_radd_attr_by_OBJ(STACK_OF(X509_ATTRIBUTE) **x, STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_OBJ(STACK_OF(X509_ATTRIBUTE) **x,
ASN1_OBJECT *obj, int type, ASN1_OBJECT *obj, int type,
unsigned char *bytes, int len); unsigned char *bytes, int len);
STACK_OF(X509_ATTRIBUTE) *X509at_radd_attr_by_NID(STACK_OF(X509_ATTRIBUTE) **x, STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_NID(STACK_OF(X509_ATTRIBUTE) **x,
int nid, int type, int nid, int type,
unsigned char *bytes, int len); unsigned char *bytes, int len);
STACK_OF(X509_ATTRIBUTE) *X509at_radd_attr_by_txt(STACK_OF(X509_ATTRIBUTE) **x, STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_txt(STACK_OF(X509_ATTRIBUTE) **x,
char *attrname, int type, char *attrname, int type,
unsigned char *bytes, int len); unsigned char *bytes, int len);
X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_NID(X509_ATTRIBUTE **attr, int nid, X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_NID(X509_ATTRIBUTE **attr, int nid,
@ -1067,13 +1067,13 @@ X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_OBJ(X509_ATTRIBUTE **attr,
ASN1_OBJECT *obj, int atrtype, void *data, int len); ASN1_OBJECT *obj, int atrtype, void *data, int len);
X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_txt(X509_ATTRIBUTE **attr, X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_txt(X509_ATTRIBUTE **attr,
char *atrname, int type, unsigned char *bytes, int len); char *atrname, int type, unsigned char *bytes, int len);
int X509_ATTRIBUTE_rset_object(X509_ATTRIBUTE *attr, ASN1_OBJECT *obj); int X509_ATTRIBUTE_set1_object(X509_ATTRIBUTE *attr, ASN1_OBJECT *obj);
int X509_ATTRIBUTE_rset_data(X509_ATTRIBUTE *attr, int attrtype, void *data, int len); int X509_ATTRIBUTE_set1_data(X509_ATTRIBUTE *attr, int attrtype, void *data, int len);
void *X509_ATTRIBUTE_iget_data(X509_ATTRIBUTE *attr, int idx, void *X509_ATTRIBUTE_get0_data(X509_ATTRIBUTE *attr, int idx,
int atrtype, void *data); int atrtype, void *data);
int X509_ATTRIBUTE_count(X509_ATTRIBUTE *attr); int X509_ATTRIBUTE_count(X509_ATTRIBUTE *attr);
ASN1_OBJECT *X509_ATTRIBUTE_iget_object(X509_ATTRIBUTE *attr); ASN1_OBJECT *X509_ATTRIBUTE_get0_object(X509_ATTRIBUTE *attr);
ASN1_TYPE *X509_ATTRIBUTE_iget_type(X509_ATTRIBUTE *attr, int idx); ASN1_TYPE *X509_ATTRIBUTE_get0_type(X509_ATTRIBUTE *attr, int idx);
int X509_verify_cert(X509_STORE_CTX *ctx); int X509_verify_cert(X509_STORE_CTX *ctx);
@ -1121,7 +1121,7 @@ int X509_TRUST_add(int id, int flags, int (*ck)(X509_TRUST *, X509 *, int),
char *name, int arg1, void *arg2); char *name, int arg1, void *arg2);
void X509_TRUST_cleanup(void); void X509_TRUST_cleanup(void);
int X509_TRUST_get_flags(X509_TRUST *xp); int X509_TRUST_get_flags(X509_TRUST *xp);
char *X509_TRUST_iget_name(X509_TRUST *xp); char *X509_TRUST_get0_name(X509_TRUST *xp);
int X509_TRUST_get_trust(X509_TRUST *xp); int X509_TRUST_get_trust(X509_TRUST *xp);
/* BEGIN ERROR CODES */ /* BEGIN ERROR CODES */
@ -1143,8 +1143,8 @@ int X509_TRUST_get_trust(X509_TRUST *xp);
#define X509_F_X509_ATTRIBUTE_CREATE_BY_NID 136 #define X509_F_X509_ATTRIBUTE_CREATE_BY_NID 136
#define X509_F_X509_ATTRIBUTE_CREATE_BY_OBJ 137 #define X509_F_X509_ATTRIBUTE_CREATE_BY_OBJ 137
#define X509_F_X509_ATTRIBUTE_CREATE_BY_TXT 140 #define X509_F_X509_ATTRIBUTE_CREATE_BY_TXT 140
#define X509_F_X509_ATTRIBUTE_IGET_DATA 139 #define X509_F_X509_ATTRIBUTE_GET0_DATA 139
#define X509_F_X509_ATTRIBUTE_RSET_DATA 138 #define X509_F_X509_ATTRIBUTE_SET1_DATA 138
#define X509_F_X509_CHECK_PRIVATE_KEY 128 #define X509_F_X509_CHECK_PRIVATE_KEY 128
#define X509_F_X509_EXTENSION_CREATE_BY_NID 108 #define X509_F_X509_EXTENSION_CREATE_BY_NID 108
#define X509_F_X509_EXTENSION_CREATE_BY_OBJ 109 #define X509_F_X509_EXTENSION_CREATE_BY_OBJ 109

36
crypto/x509/x509_att.c
View file

@ -119,7 +119,7 @@ X509_ATTRIBUTE *X509at_delete_attr(STACK_OF(X509_ATTRIBUTE) *x, int loc)
return(ret); return(ret);
} }
STACK_OF(X509_ATTRIBUTE) *X509at_radd_attr(STACK_OF(X509_ATTRIBUTE) **x, STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr(STACK_OF(X509_ATTRIBUTE) **x,
X509_ATTRIBUTE *attr) X509_ATTRIBUTE *attr)
{ {
X509_ATTRIBUTE *new_attr=NULL; X509_ATTRIBUTE *new_attr=NULL;
@ -148,7 +148,7 @@ err2:
return(NULL); return(NULL);
} }
STACK_OF(X509_ATTRIBUTE) *X509at_radd_attr_by_OBJ(STACK_OF(X509_ATTRIBUTE) **x, STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_OBJ(STACK_OF(X509_ATTRIBUTE) **x,
ASN1_OBJECT *obj, int type, ASN1_OBJECT *obj, int type,
unsigned char *bytes, int len) unsigned char *bytes, int len)
{ {
@ -156,12 +156,12 @@ STACK_OF(X509_ATTRIBUTE) *X509at_radd_attr_by_OBJ(STACK_OF(X509_ATTRIBUTE) **x,
STACK_OF(X509_ATTRIBUTE) *ret; STACK_OF(X509_ATTRIBUTE) *ret;
attr = X509_ATTRIBUTE_create_by_OBJ(NULL, obj, type, bytes, len); attr = X509_ATTRIBUTE_create_by_OBJ(NULL, obj, type, bytes, len);
if(!attr) return 0; if(!attr) return 0;
ret = X509at_radd_attr(x, attr); ret = X509at_add1_attr(x, attr);
X509_ATTRIBUTE_free(attr); X509_ATTRIBUTE_free(attr);
return ret; return ret;
} }
STACK_OF(X509_ATTRIBUTE) *X509at_radd_attr_by_NID(STACK_OF(X509_ATTRIBUTE) **x, STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_NID(STACK_OF(X509_ATTRIBUTE) **x,
int nid, int type, int nid, int type,
unsigned char *bytes, int len) unsigned char *bytes, int len)
{ {
@ -169,12 +169,12 @@ STACK_OF(X509_ATTRIBUTE) *X509at_radd_attr_by_NID(STACK_OF(X509_ATTRIBUTE) **x,
STACK_OF(X509_ATTRIBUTE) *ret; STACK_OF(X509_ATTRIBUTE) *ret;
attr = X509_ATTRIBUTE_create_by_NID(NULL, nid, type, bytes, len); attr = X509_ATTRIBUTE_create_by_NID(NULL, nid, type, bytes, len);
if(!attr) return 0; if(!attr) return 0;
ret = X509at_radd_attr(x, attr); ret = X509at_add1_attr(x, attr);
X509_ATTRIBUTE_free(attr); X509_ATTRIBUTE_free(attr);
return ret; return ret;
} }
STACK_OF(X509_ATTRIBUTE) *X509at_radd_attr_by_txt(STACK_OF(X509_ATTRIBUTE) **x, STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_txt(STACK_OF(X509_ATTRIBUTE) **x,
char *attrname, int type, char *attrname, int type,
unsigned char *bytes, int len) unsigned char *bytes, int len)
{ {
@ -182,7 +182,7 @@ STACK_OF(X509_ATTRIBUTE) *X509at_radd_attr_by_txt(STACK_OF(X509_ATTRIBUTE) **x,
STACK_OF(X509_ATTRIBUTE) *ret; STACK_OF(X509_ATTRIBUTE) *ret;
attr = X509_ATTRIBUTE_create_by_txt(NULL, attrname, type, bytes, len); attr = X509_ATTRIBUTE_create_by_txt(NULL, attrname, type, bytes, len);
if(!attr) return 0; if(!attr) return 0;
ret = X509at_radd_attr(x, attr); ret = X509at_add1_attr(x, attr);
X509_ATTRIBUTE_free(attr); X509_ATTRIBUTE_free(attr);
return ret; return ret;
} }
@ -220,9 +220,9 @@ X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_OBJ(X509_ATTRIBUTE **attr,
else else
ret= *attr; ret= *attr;
if (!X509_ATTRIBUTE_rset_object(ret,obj)) if (!X509_ATTRIBUTE_set1_object(ret,obj))
goto err; goto err;
if (!X509_ATTRIBUTE_rset_data(ret,atrtype,data,len)) if (!X509_ATTRIBUTE_set1_data(ret,atrtype,data,len))
goto err; goto err;
if ((attr != NULL) && (*attr == NULL)) *attr=ret; if ((attr != NULL) && (*attr == NULL)) *attr=ret;
@ -252,7 +252,7 @@ X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_txt(X509_ATTRIBUTE **attr,
return nattr; return nattr;
} }
int X509_ATTRIBUTE_rset_object(X509_ATTRIBUTE *attr, ASN1_OBJECT *obj) int X509_ATTRIBUTE_set1_object(X509_ATTRIBUTE *attr, ASN1_OBJECT *obj)
{ {
if ((attr == NULL) || (obj == NULL)) if ((attr == NULL) || (obj == NULL))
return(0); return(0);
@ -261,7 +261,7 @@ int X509_ATTRIBUTE_rset_object(X509_ATTRIBUTE *attr, ASN1_OBJECT *obj)
return(1); return(1);
} }
int X509_ATTRIBUTE_rset_data(X509_ATTRIBUTE *attr, int attrtype, void *data, int len) int X509_ATTRIBUTE_set1_data(X509_ATTRIBUTE *attr, int attrtype, void *data, int len)
{ {
ASN1_TYPE *ttmp; ASN1_TYPE *ttmp;
ASN1_STRING *stmp; ASN1_STRING *stmp;
@ -271,7 +271,7 @@ int X509_ATTRIBUTE_rset_data(X509_ATTRIBUTE *attr, int attrtype, void *data, int
stmp = ASN1_STRING_set_by_NID(NULL, data, len, attrtype, stmp = ASN1_STRING_set_by_NID(NULL, data, len, attrtype,
OBJ_obj2nid(attr->object)); OBJ_obj2nid(attr->object));
if(!stmp) { if(!stmp) {
X509err(X509_F_X509_ATTRIBUTE_RSET_DATA, ERR_R_ASN1_LIB); X509err(X509_F_X509_ATTRIBUTE_SET1_DATA, ERR_R_ASN1_LIB);
return 0; return 0;
} }
atype = stmp->type; atype = stmp->type;
@ -287,7 +287,7 @@ int X509_ATTRIBUTE_rset_data(X509_ATTRIBUTE *attr, int attrtype, void *data, int
ASN1_TYPE_set(ttmp, atype, stmp); ASN1_TYPE_set(ttmp, atype, stmp);
return 1; return 1;
err: err:
X509err(X509_F_X509_ATTRIBUTE_RSET_DATA, ERR_R_MALLOC_FAILURE); X509err(X509_F_X509_ATTRIBUTE_SET1_DATA, ERR_R_MALLOC_FAILURE);
return 0; return 0;
} }
@ -298,26 +298,26 @@ int X509_ATTRIBUTE_count(X509_ATTRIBUTE *attr)
return 0; return 0;
} }
ASN1_OBJECT *X509_ATTRIBUTE_iget_object(X509_ATTRIBUTE *attr) ASN1_OBJECT *X509_ATTRIBUTE_get0_object(X509_ATTRIBUTE *attr)
{ {
if (attr == NULL) return(NULL); if (attr == NULL) return(NULL);
return(attr->object); return(attr->object);
} }
void *X509_ATTRIBUTE_iget_data(X509_ATTRIBUTE *attr, int idx, void *X509_ATTRIBUTE_get0_data(X509_ATTRIBUTE *attr, int idx,
int atrtype, void *data) int atrtype, void *data)
{ {
ASN1_TYPE *ttmp; ASN1_TYPE *ttmp;
ttmp = X509_ATTRIBUTE_iget_type(attr, idx); ttmp = X509_ATTRIBUTE_get0_type(attr, idx);
if(!ttmp) return NULL; if(!ttmp) return NULL;
if(atrtype != ASN1_TYPE_get(ttmp)){ if(atrtype != ASN1_TYPE_get(ttmp)){
X509err(X509_F_X509_ATTRIBUTE_IGET_DATA, X509_R_WRONG_TYPE); X509err(X509_F_X509_ATTRIBUTE_GET0_DATA, X509_R_WRONG_TYPE);
return NULL; return NULL;
} }
return ttmp->value.ptr; return ttmp->value.ptr;
} }
ASN1_TYPE *X509_ATTRIBUTE_iget_type(X509_ATTRIBUTE *attr, int idx) ASN1_TYPE *X509_ATTRIBUTE_get0_type(X509_ATTRIBUTE *attr, int idx)
{ {
if (attr == NULL) return(NULL); if (attr == NULL) return(NULL);
if(idx >= X509_ATTRIBUTE_count(attr)) return NULL; if(idx >= X509_ATTRIBUTE_count(attr)) return NULL;

4
crypto/x509/x509_err.c
View file

@ -76,8 +76,8 @@ static ERR_STRING_DATA X509_str_functs[]=
{ERR_PACK(0,X509_F_X509_ATTRIBUTE_CREATE_BY_NID,0), "X509_ATTRIBUTE_create_by_NID"}, {ERR_PACK(0,X509_F_X509_ATTRIBUTE_CREATE_BY_NID,0), "X509_ATTRIBUTE_create_by_NID"},
{ERR_PACK(0,X509_F_X509_ATTRIBUTE_CREATE_BY_OBJ,0), "X509_ATTRIBUTE_create_by_OBJ"}, {ERR_PACK(0,X509_F_X509_ATTRIBUTE_CREATE_BY_OBJ,0), "X509_ATTRIBUTE_create_by_OBJ"},
{ERR_PACK(0,X509_F_X509_ATTRIBUTE_CREATE_BY_TXT,0), "X509_ATTRIBUTE_create_by_txt"}, {ERR_PACK(0,X509_F_X509_ATTRIBUTE_CREATE_BY_TXT,0), "X509_ATTRIBUTE_create_by_txt"},
{ERR_PACK(0,X509_F_X509_ATTRIBUTE_IGET_DATA,0), "X509_ATTRIBUTE_iget_data"}, {ERR_PACK(0,X509_F_X509_ATTRIBUTE_GET0_DATA,0), "X509_ATTRIBUTE_get0_data"},
{ERR_PACK(0,X509_F_X509_ATTRIBUTE_RSET_DATA,0), "X509_ATTRIBUTE_rset_data"}, {ERR_PACK(0,X509_F_X509_ATTRIBUTE_SET1_DATA,0), "X509_ATTRIBUTE_set1_data"},
{ERR_PACK(0,X509_F_X509_CHECK_PRIVATE_KEY,0), "X509_check_private_key"}, {ERR_PACK(0,X509_F_X509_CHECK_PRIVATE_KEY,0), "X509_check_private_key"},
{ERR_PACK(0,X509_F_X509_EXTENSION_CREATE_BY_NID,0), "X509_EXTENSION_create_by_NID"}, {ERR_PACK(0,X509_F_X509_EXTENSION_CREATE_BY_NID,0), "X509_EXTENSION_create_by_NID"},
{ERR_PACK(0,X509_F_X509_EXTENSION_CREATE_BY_OBJ,0), "X509_EXTENSION_create_by_OBJ"}, {ERR_PACK(0,X509_F_X509_EXTENSION_CREATE_BY_OBJ,0), "X509_EXTENSION_create_by_OBJ"},

16
crypto/x509/x509_req.c
View file

@ -244,35 +244,35 @@ X509_ATTRIBUTE *X509_REQ_delete_attr(X509_REQ *req, int loc)
return X509at_delete_attr(req->req_info->attributes, loc); return X509at_delete_attr(req->req_info->attributes, loc);
} }
int X509_REQ_radd_attr(X509_REQ *req, X509_ATTRIBUTE *attr) int X509_REQ_add1_attr(X509_REQ *req, X509_ATTRIBUTE *attr)
{ {
if(X509at_radd_attr(&req->req_info->attributes, attr)) return 1; if(X509at_add1_attr(&req->req_info->attributes, attr)) return 1;
return 0; return 0;
} }
int X509_REQ_radd_attr_by_OBJ(X509_REQ *req, int X509_REQ_add1_attr_by_OBJ(X509_REQ *req,
ASN1_OBJECT *obj, int type, ASN1_OBJECT *obj, int type,
unsigned char *bytes, int len) unsigned char *bytes, int len)
{ {
if(X509at_radd_attr_by_OBJ(&req->req_info->attributes, obj, if(X509at_add1_attr_by_OBJ(&req->req_info->attributes, obj,
type, bytes, len)) return 1; type, bytes, len)) return 1;
return 0; return 0;
} }
int X509_REQ_radd_attr_by_NID(X509_REQ *req, int X509_REQ_add1_attr_by_NID(X509_REQ *req,
int nid, int type, int nid, int type,
unsigned char *bytes, int len) unsigned char *bytes, int len)
{ {
if(X509at_radd_attr_by_NID(&req->req_info->attributes, nid, if(X509at_add1_attr_by_NID(&req->req_info->attributes, nid,
type, bytes, len)) return 1; type, bytes, len)) return 1;
return 0; return 0;
} }
int X509_REQ_radd_attr_by_txt(X509_REQ *req, int X509_REQ_add1_attr_by_txt(X509_REQ *req,
char *attrname, int type, char *attrname, int type,
unsigned char *bytes, int len) unsigned char *bytes, int len)
{ {
if(X509at_radd_attr_by_txt(&req->req_info->attributes, attrname, if(X509at_add1_attr_by_txt(&req->req_info->attributes, attrname,
type, bytes, len)) return 1; type, bytes, len)) return 1;
return 0; return 0;
} }

2
crypto/x509/x509_trs.c
View file

@ -214,7 +214,7 @@ int X509_TRUST_get_flags(X509_TRUST *xp)
return xp->flags; return xp->flags;
} }
char *X509_TRUST_iget_name(X509_TRUST *xp) char *X509_TRUST_get0_name(X509_TRUST *xp)
{ {
return xp->name; return xp->name;
} }

2
crypto/x509/x509_vfy.c
View file

@ -717,7 +717,7 @@ STACK_OF(X509) *X509_STORE_CTX_get_chain(X509_STORE_CTX *ctx)
return(ctx->chain); return(ctx->chain);
} }
STACK_OF(X509) *X509_STORE_CTX_rget_chain(X509_STORE_CTX *ctx) STACK_OF(X509) *X509_STORE_CTX_get1_chain(X509_STORE_CTX *ctx)
{ {
int i; int i;
X509 *x; X509 *x;

2
crypto/x509/x509_vfy.h
View file

@ -347,7 +347,7 @@ void X509_STORE_CTX_set_error(X509_STORE_CTX *ctx,int s);
int X509_STORE_CTX_get_error_depth(X509_STORE_CTX *ctx); int X509_STORE_CTX_get_error_depth(X509_STORE_CTX *ctx);
X509 * X509_STORE_CTX_get_current_cert(X509_STORE_CTX *ctx); X509 * X509_STORE_CTX_get_current_cert(X509_STORE_CTX *ctx);
STACK_OF(X509) *X509_STORE_CTX_get_chain(X509_STORE_CTX *ctx); STACK_OF(X509) *X509_STORE_CTX_get_chain(X509_STORE_CTX *ctx);
STACK_OF(X509) *X509_STORE_CTX_rget_chain(X509_STORE_CTX *ctx); STACK_OF(X509) *X509_STORE_CTX_get1_chain(X509_STORE_CTX *ctx);
void X509_STORE_CTX_set_cert(X509_STORE_CTX *c,X509 *x); void X509_STORE_CTX_set_cert(X509_STORE_CTX *c,X509 *x);
void X509_STORE_CTX_set_chain(X509_STORE_CTX *c,STACK_OF(X509) *sk); void X509_STORE_CTX_set_chain(X509_STORE_CTX *c,STACK_OF(X509) *sk);
int X509_STORE_CTX_set_purpose(X509_STORE_CTX *ctx, int purpose); int X509_STORE_CTX_set_purpose(X509_STORE_CTX *ctx, int purpose);

4
crypto/x509v3/v3_purp.c
View file

@ -232,12 +232,12 @@ int X509_PURPOSE_get_id(X509_PURPOSE *xp)
return xp->purpose; return xp->purpose;
} }
char *X509_PURPOSE_iget_name(X509_PURPOSE *xp) char *X509_PURPOSE_get0_name(X509_PURPOSE *xp)
{ {
return xp->name; return xp->name;
} }
char *X509_PURPOSE_iget_sname(X509_PURPOSE *xp) char *X509_PURPOSE_get0_sname(X509_PURPOSE *xp)
{ {
return xp->sname; return xp->sname;
} }

4
crypto/x509v3/x509v3.h
View file

@ -535,8 +535,8 @@ int X509_PURPOSE_get_by_id(int id);
int X509_PURPOSE_add(int id, int trust, int flags, int X509_PURPOSE_add(int id, int trust, int flags,
int (*ck)(X509_PURPOSE *, X509 *, int), int (*ck)(X509_PURPOSE *, X509 *, int),
char *name, char *sname, void *arg); char *name, char *sname, void *arg);
char *X509_PURPOSE_iget_name(X509_PURPOSE *xp); char *X509_PURPOSE_get0_name(X509_PURPOSE *xp);
char *X509_PURPOSE_iget_sname(X509_PURPOSE *xp); char *X509_PURPOSE_get0_sname(X509_PURPOSE *xp);
int X509_PURPOSE_get_trust(X509_PURPOSE *xp); int X509_PURPOSE_get_trust(X509_PURPOSE *xp);
void X509_PURPOSE_cleanup(void); void X509_PURPOSE_cleanup(void);
int X509_PURPOSE_get_id(X509_PURPOSE *); int X509_PURPOSE_get_id(X509_PURPOSE *);

52
util/libeay.num
View file

@ -1906,7 +1906,7 @@ X509_TRUST_add 1931
ASN1_VISIBLESTRING_new 1932 ASN1_VISIBLESTRING_new 1932
X509_alias_rset 1933 X509_alias_rset 1933
ASN1_PRINTABLESTRING_free 1934 ASN1_PRINTABLESTRING_free 1934
EVP_PKEY_rget_DSA 1935 EVP_PKEY_get1_DSA 1935
ASN1_BMPSTRING_new 1936 ASN1_BMPSTRING_new 1936
ASN1_mbstring_copy 1937 ASN1_mbstring_copy 1937
ASN1_UTF8STRING_new 1938 ASN1_UTF8STRING_new 1938
@ -1941,7 +1941,7 @@ sk_ASN1_STRING_TABLE_delete_ptr 1966
X509_trust_set_bit_asc 1967 X509_trust_set_bit_asc 1967
PEM_write_bio_DSA_PUBKEY 1968 PEM_write_bio_DSA_PUBKEY 1968
X509_STORE_CTX_free 1969 X509_STORE_CTX_free 1969
EVP_PKEY_rset_DSA 1970 EVP_PKEY_set1_DSA 1970
i2d_DSA_PUBKEY_fp 1971 i2d_DSA_PUBKEY_fp 1971
X509_load_cert_crl_file 1972 X509_load_cert_crl_file 1972
ASN1_TIME_new 1973 ASN1_TIME_new 1973
@ -1982,7 +1982,7 @@ X509_TRUST_cleanup 2007
X509_NAME_add_entry_by_OBJ 2008 X509_NAME_add_entry_by_OBJ 2008
X509_CRL_get_ext_d2i 2009 X509_CRL_get_ext_d2i 2009
sk_X509_TRUST_set 2010 sk_X509_TRUST_set 2010
X509_PURPOSE_iget_name 2011 X509_PURPOSE_get0_name 2011
PEM_read_PUBKEY 2012 PEM_read_PUBKEY 2012
sk_ACCESS_DESCRIPTION_new 2013 sk_ACCESS_DESCRIPTION_new 2013
i2d_DSA_PUBKEY_bio 2014 i2d_DSA_PUBKEY_bio 2014
@ -2005,7 +2005,7 @@ X509_STORE_CTX_set_trust 2030
sk_X509_PURPOSE_unshift 2031 sk_X509_PURPOSE_unshift 2031
ASN1_STRING_set_default_mask 2032 ASN1_STRING_set_default_mask 2032
X509_STORE_CTX_new 2033 X509_STORE_CTX_new 2033
EVP_PKEY_rget_RSA 2034 EVP_PKEY_get1_RSA 2034
sk_X509_PURPOSE_set 2035 sk_X509_PURPOSE_set 2035
sk_ASN1_STRING_TABLE_insert 2036 sk_ASN1_STRING_TABLE_insert 2036
sk_X509_PURPOSE_sort 2037 sk_X509_PURPOSE_sort 2037
@ -2017,7 +2017,7 @@ sk_ASN1_STRING_TABLE_free 2042
sk_X509_TRUST_value 2043 sk_X509_TRUST_value 2043
d2i_RSA_PUBKEY 2044 d2i_RSA_PUBKEY 2044
sk_ASN1_STRING_TABLE_set 2045 sk_ASN1_STRING_TABLE_set 2045
X509_TRUST_iget_name 2046 X509_TRUST_get0_name 2046
X509_TRUST_iget 2047 X509_TRUST_iget 2047
AUTHORITY_INFO_ACCESS_free 2048 AUTHORITY_INFO_ACCESS_free 2048
ASN1_IA5STRING_new 2049 ASN1_IA5STRING_new 2049
@ -2034,7 +2034,7 @@ sk_X509_TRUST_unshift 2059
ASN1_UTCTIME_new 2060 ASN1_UTCTIME_new 2060
sk_ACCESS_DESCRIPTION_pop 2061 sk_ACCESS_DESCRIPTION_pop 2061
i2d_AUTHORITY_INFO_ACCESS 2062 i2d_AUTHORITY_INFO_ACCESS 2062
EVP_PKEY_rset_RSA 2063 EVP_PKEY_set1_RSA 2063
X509_STORE_CTX_set_purpose 2064 X509_STORE_CTX_set_purpose 2064
ASN1_IA5STRING_free 2065 ASN1_IA5STRING_free 2065
PEM_write_bio_X509_AUX 2066 PEM_write_bio_X509_AUX 2066
@ -2053,7 +2053,7 @@ X509_trust_set_bit 2078
sk_X509_PURPOSE_delete_ptr 2079 sk_X509_PURPOSE_delete_ptr 2079
ASN1_BIT_STRING_free 2080 ASN1_BIT_STRING_free 2080
PEM_read_bio_RSA_PUBKEY 2081 PEM_read_bio_RSA_PUBKEY 2081
X509_radd_reject_object 2082 X509_add1_reject_object 2082
X509_check_trust 2083 X509_check_trust 2083
sk_X509_TRUST_new_null 2084 sk_X509_TRUST_new_null 2084
sk_ACCESS_DESCRIPTION_new_null 2085 sk_ACCESS_DESCRIPTION_new_null 2085
@ -2076,9 +2076,9 @@ PEM_write_DSA_PUBKEY 2101
sk_X509_PURPOSE_free 2102 sk_X509_PURPOSE_free 2102
sk_X509_PURPOSE_dup 2103 sk_X509_PURPOSE_dup 2103
sk_ASN1_STRING_TABLE_zero 2104 sk_ASN1_STRING_TABLE_zero 2104
X509_PURPOSE_iget_sname 2105 X509_PURPOSE_get0_sname 2105
sk_ASN1_STRING_TABLE_shift 2106 sk_ASN1_STRING_TABLE_shift 2106
EVP_PKEY_rset_DH 2107 EVP_PKEY_set1_DH 2107
ASN1_OCTET_STRING_dup 2108 ASN1_OCTET_STRING_dup 2108
ASN1_BIT_STRING_set 2109 ASN1_BIT_STRING_set 2109
X509_TRUST_get_count 2110 X509_TRUST_get_count 2110
@ -2099,7 +2099,7 @@ sk_X509_PURPOSE_new 2124
sk_X509_PURPOSE_insert 2125 sk_X509_PURPOSE_insert 2125
ASN1_GENERALIZEDTIME_new 2126 ASN1_GENERALIZEDTIME_new 2126
sk_ACCESS_DESCRIPTION_sort 2127 sk_ACCESS_DESCRIPTION_sort 2127
EVP_PKEY_rget_DH 2128 EVP_PKEY_get1_DH 2128
sk_ACCESS_DESCRIPTION_set_cmp_func 2129 sk_ACCESS_DESCRIPTION_set_cmp_func 2129
ASN1_OCTET_STRING_new 2130 ASN1_OCTET_STRING_new 2130
ASN1_INTEGER_new 2131 ASN1_INTEGER_new 2131
@ -2111,7 +2111,7 @@ ASN1_STRING_length_set 2136
DIRECTORYSTRING_new 2137 DIRECTORYSTRING_new 2137
sk_ASN1_STRING_TABLE_new 2138 sk_ASN1_STRING_TABLE_new 2138
sk_X509_TRUST_delete 2139 sk_X509_TRUST_delete 2139
X509_radd_trust_object 2140 X509_add1_trust_object 2140
PKCS12_newpass 2141 PKCS12_newpass 2141
SMIME_write_PKCS7 2142 SMIME_write_PKCS7 2142
SMIME_read_PKCS7 2143 SMIME_read_PKCS7 2143
@ -2121,7 +2121,7 @@ PKCS7_encrypt 2146
des_set_key_unchecked 2147 des_set_key_unchecked 2147
SMIME_crlf_copy 2148 SMIME_crlf_copy 2148
i2d_ASN1_PRINTABLESTRING 2149 i2d_ASN1_PRINTABLESTRING 2149
PKCS7_iget_signers 2150 PKCS7_get0_signers 2150
PKCS7_decrypt 2151 PKCS7_decrypt 2151
SMIME_text 2152 SMIME_text 2152
PKCS7_simple_smimecap 2153 PKCS7_simple_smimecap 2153
@ -2158,39 +2158,39 @@ i2d_PrivateKey_bio 2183
X509_reject_clear 2184 X509_reject_clear 2184
X509_TRUST_set_default 2185 X509_TRUST_set_default 2185
d2i_AutoPrivateKey 2186 d2i_AutoPrivateKey 2186
X509_ATTRIBUTE_iget_type 2187 X509_ATTRIBUTE_get0_type 2187
X509_ATTRIBUTE_rset_data 2188 X509_ATTRIBUTE_set1_data 2188
X509at_get_attr 2189 X509at_get_attr 2189
X509at_get_attr_count 2190 X509at_get_attr_count 2190
X509_ATTRIBUTE_create_by_NID 2191 X509_ATTRIBUTE_create_by_NID 2191
X509_ATTRIBUTE_rset_object 2192 X509_ATTRIBUTE_set1_object 2192
X509_ATTRIBUTE_count 2193 X509_ATTRIBUTE_count 2193
X509_ATTRIBUTE_create_by_OBJ 2194 X509_ATTRIBUTE_create_by_OBJ 2194
X509_ATTRIBUTE_iget_object 2195 X509_ATTRIBUTE_get0_object 2195
X509at_get_attr_by_NID 2196 X509at_get_attr_by_NID 2196
X509at_radd_attr 2197 X509at_add1_attr 2197
X509_ATTRIBUTE_iget_data 2198 X509_ATTRIBUTE_get0_data 2198
X509at_delete_attr 2199 X509at_delete_attr 2199
X509at_get_attr_by_OBJ 2200 X509at_get_attr_by_OBJ 2200
RAND_add 2201 RAND_add 2201
BIO_number_written 2202 BIO_number_written 2202
BIO_number_read 2203 BIO_number_read 2203
X509_STORE_CTX_rget_chain 2204 X509_STORE_CTX_get1_chain 2204
ERR_load_RAND_strings 2205 ERR_load_RAND_strings 2205
RAND_pseudo_bytes 2206 RAND_pseudo_bytes 2206
X509_REQ_get_attr_by_NID 2207 X509_REQ_get_attr_by_NID 2207
X509_REQ_get_attr 2208 X509_REQ_get_attr 2208
X509_REQ_radd_attr_by_NID 2209 X509_REQ_add1_attr_by_NID 2209
X509_REQ_get_attr_by_OBJ 2210 X509_REQ_get_attr_by_OBJ 2210
X509at_radd_attr_by_NID 2211 X509at_add1_attr_by_NID 2211
X509_REQ_radd_attr_by_OBJ 2212 X509_REQ_add1_attr_by_OBJ 2212
X509_REQ_get_attr_count 2213 X509_REQ_get_attr_count 2213
X509_REQ_radd_attr 2214 X509_REQ_add1_attr 2214
X509_REQ_delete_attr 2215 X509_REQ_delete_attr 2215
X509at_radd_attr_by_OBJ 2216 X509at_add1_attr_by_OBJ 2216
X509_REQ_radd_attr_by_txt 2217 X509_REQ_add1_attr_by_txt 2217
X509_ATTRIBUTE_create_by_txt 2218 X509_ATTRIBUTE_create_by_txt 2218
X509at_radd_attr_by_txt 2219 X509at_add1_attr_by_txt 2219
sk_CRYPTO_EX_DATA_FUNCS_delete 2220 sk_CRYPTO_EX_DATA_FUNCS_delete 2220
sk_CRYPTO_EX_DATA_FUNCS_set 2221 sk_CRYPTO_EX_DATA_FUNCS_set 2221
sk_CRYPTO_EX_DATA_FUNCS_unshift 2222 sk_CRYPTO_EX_DATA_FUNCS_unshift 2222