More get0 et al. changes. Also provide fgrep targets in CHANGES

where the new functions are mentioned.

6 files changed, 14 insertions, 14 deletions

diff --git a/crypto/asn1/x_x509a.c b/crypto/asn1/x_x509a.c
index f3bd3f89b5..b9987ea968 100644
--- a/crypto/asn1/x_x509a.c
+++ b/crypto/asn1/x_x509a.c
@@ -145,7 +145,7 @@ static X509_CERT_AUX *aux_get(X509 *x)
 	return x->aux;
 }
 
-int X509_alias_rset(X509 *x, unsigned char *name, int len)
+int X509_alias_set1(X509 *x, unsigned char *name, int len)
 {
 	X509_CERT_AUX *aux;
 	if(!(aux = aux_get(x))) return 0;
@@ -153,7 +153,7 @@ int X509_alias_rset(X509 *x, unsigned char *name, int len)
 	return ASN1_STRING_set(aux->alias, name, len);
 }
 
-unsigned char *X509_alias_iget(X509 *x, int *len)
+unsigned char *X509_alias_get0(X509 *x, int *len)
 {
 	if(!x->aux || !x->aux->alias) return NULL;
 	if(len) *len = x->aux->alias->length;
diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h
index bd602ce8b1..d3336d9ceb 100644
--- a/crypto/x509/x509.h
+++ b/crypto/x509/x509.h
@@ -822,8 +822,8 @@ void		X509_CERT_AUX_free(X509_CERT_AUX *a);
 int		i2d_X509_CERT_AUX(X509_CERT_AUX *a,unsigned char **pp);
 X509_CERT_AUX *	d2i_X509_CERT_AUX(X509_CERT_AUX **a,unsigned char **pp,
 								long length);
-int X509_alias_rset(X509 *x, unsigned char *name, int len);
-unsigned char * X509_alias_iget(X509 *x, int *len);
+int X509_alias_set1(X509 *x, unsigned char *name, int len);
+unsigned char * X509_alias_get0(X509 *x, int *len);
 int (*X509_TRUST_set_default(int (*trust)(int , X509 *, int)))(int, X509 *, int);
 int X509_add1_trust_object(X509 *x, ASN1_OBJECT *obj);
 int X509_add1_reject_object(X509 *x, ASN1_OBJECT *obj);
@@ -1115,7 +1115,7 @@ PKCS8_PRIV_KEY_INFO *PKCS8_set_broken(PKCS8_PRIV_KEY_INFO *p8, int broken);
 
 int X509_check_trust(X509 *x, int id, int flags);
 int X509_TRUST_get_count(void);
-X509_TRUST * X509_TRUST_iget(int idx);
+X509_TRUST * X509_TRUST_get0(int idx);
 int X509_TRUST_get_by_id(int id);
 int X509_TRUST_add(int id, int flags, int (*ck)(X509_TRUST *, X509 *, int),
 					char *name, int arg1, void *arg2);
diff --git a/crypto/x509/x509_trs.c b/crypto/x509/x509_trs.c
index 3f76cd89df..9f7d67952d 100644
--- a/crypto/x509/x509_trs.c
+++ b/crypto/x509/x509_trs.c
@@ -109,7 +109,7 @@ int X509_check_trust(X509 *x, int id, int flags)
 	if(id == -1) return 1;
 	if(!(idx = X509_TRUST_get_by_id(id)))
 			return default_trust(id, x, flags);
-	pt = X509_TRUST_iget(idx);
+	pt = X509_TRUST_get0(idx);
 	return pt->check_trust(pt, x, flags);
 }
 
@@ -119,7 +119,7 @@ int X509_TRUST_get_count(void)
 	return sk_X509_TRUST_num(trtable) + X509_TRUST_COUNT;
 }
 
-X509_TRUST * X509_TRUST_iget(int idx)
+X509_TRUST * X509_TRUST_get0(int idx)
 {
 	if(idx < 0) return NULL;
 	if(idx < X509_TRUST_COUNT) return trstandard + idx;
@@ -157,7 +157,7 @@ int X509_TRUST_add(int id, int flags, int (*ck)(X509_TRUST *, X509 *, int),
 			return 0;
 		}
 		trtmp->flags = X509_TRUST_DYNAMIC;
-	} else trtmp = X509_TRUST_iget(idx);
+	} else trtmp = X509_TRUST_get0(idx);
 
 	/* Free existing name if dynamic */
 	if(trtmp->flags & X509_TRUST_DYNAMIC_NAME) Free(trtmp->name);
diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
index 8de6cc97f3..4fdff54124 100644
--- a/crypto/x509/x509_vfy.c
+++ b/crypto/x509/x509_vfy.c
@@ -777,7 +777,7 @@ int X509_STORE_CTX_purpose_inherit(X509_STORE_CTX *ctx, int def_purpose,
 		/* If trust not set then get from purpose default */
 		if(!trust) {
 			X509_PURPOSE *ptmp;
-			ptmp = X509_PURPOSE_iget(idx);
+			ptmp = X509_PURPOSE_get0(idx);
 			trust = ptmp->trust;
 		}
 	}
diff --git a/crypto/x509v3/v3_purp.c b/crypto/x509v3/v3_purp.c
index 08fbd6767a..b7494ebcd5 100644
--- a/crypto/x509v3/v3_purp.c
+++ b/crypto/x509v3/v3_purp.c
@@ -107,7 +107,7 @@ int X509_check_purpose(X509 *x, int id, int ca)
 	if(id == -1) return 1;
 	idx = X509_PURPOSE_get_by_id(id);
 	if(idx == -1) return -1;
-	pt = X509_PURPOSE_iget(idx);
+	pt = X509_PURPOSE_get0(idx);
 	return pt->check_purpose(pt, x, ca);
 }
 
@@ -117,7 +117,7 @@ int X509_PURPOSE_get_count(void)
 	return sk_X509_PURPOSE_num(xptable) + X509_PURPOSE_COUNT;
 }
 
-X509_PURPOSE * X509_PURPOSE_iget(int idx)
+X509_PURPOSE * X509_PURPOSE_get0(int idx)
 {
 	if(idx < 0) return NULL;
 	if(idx < X509_PURPOSE_COUNT) return xstandard + idx;
@@ -129,7 +129,7 @@ int X509_PURPOSE_get_by_sname(char *sname)
 	int i;
 	X509_PURPOSE *xptmp;
 	for(i = 0; i < X509_PURPOSE_get_count(); i++) {
-		xptmp = X509_PURPOSE_iget(i);
+		xptmp = X509_PURPOSE_get0(i);
 		if(!strcmp(xptmp->sname, sname)) return i;
 	}
 	return -1;
@@ -168,7 +168,7 @@ int X509_PURPOSE_add(int id, int trust, int flags,
 			return 0;
 		}
 		ptmp->flags = X509_PURPOSE_DYNAMIC;
-	} else ptmp = X509_PURPOSE_iget(idx);
+	} else ptmp = X509_PURPOSE_get0(idx);
 
 	/* Free existing name if dynamic */
 	if(ptmp->flags & X509_PURPOSE_DYNAMIC_NAME) {
diff --git a/crypto/x509v3/x509v3.h b/crypto/x509v3/x509v3.h
index a977bf4215..fe01755797 100644
--- a/crypto/x509v3/x509v3.h
+++ b/crypto/x509v3/x509v3.h
@@ -529,7 +529,7 @@ int X509V3_EXT_print_fp(FILE *out, X509_EXTENSION *ext, int flag, int indent);
 
 int X509_check_purpose(X509 *x, int id, int ca);
 int X509_PURPOSE_get_count(void);
-X509_PURPOSE * X509_PURPOSE_iget(int idx);
+X509_PURPOSE * X509_PURPOSE_get0(int idx);
 int X509_PURPOSE_get_by_sname(char *sname);
 int X509_PURPOSE_get_by_id(int id);
 int X509_PURPOSE_add(int id, int trust, int flags,