projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
long obsolete
[oweals/openssl.git]
/
crypto
/
x509
/
x509name.c
diff --git
a/crypto/x509/x509name.c
b/crypto/x509/x509name.c
index 2bc5f29d08798d469492cca2d7e02b4b96b5cf68..2a422be3502cfb35a6ad4f95b329e290f376c708 100644
(file)
--- a/
crypto/x509/x509name.c
+++ b/
crypto/x509/x509name.c
@@
-57,12
+57,12
@@
*/
#include <stdio.h>
*/
#include <stdio.h>
-#include
"stack.h"
+#include
<openssl/stack.h>
#include "cryptlib.h"
#include "cryptlib.h"
-#include
"asn1.h"
-#include
"objects.h"
-#include
"evp.h"
-#include
"x509.h"
+#include
<openssl/asn1.h>
+#include
<openssl/objects.h>
+#include
<openssl/evp.h>
+#include
<openssl/x509.h>
int X509_NAME_get_text_by_NID(X509_NAME *name, int nid, char *buf, int len)
{
int X509_NAME_get_text_by_NID(X509_NAME *name, int nid, char *buf, int len)
{
@@
-92,7
+92,7
@@
int X509_NAME_get_text_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, char *buf,
int X509_NAME_entry_count(X509_NAME *name)
{
if (name == NULL) return(0);
int X509_NAME_entry_count(X509_NAME *name)
{
if (name == NULL) return(0);
- return(sk_num(name->entries));
+ return(sk_
X509_NAME_ENTRY_
num(name->entries));
}
int X509_NAME_get_index_by_NID(X509_NAME *name, int nid, int lastpos)
}
int X509_NAME_get_index_by_NID(X509_NAME *name, int nid, int lastpos)
@@
-110,16
+110,16
@@
int X509_NAME_get_index_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj,
{
int n;
X509_NAME_ENTRY *ne;
{
int n;
X509_NAME_ENTRY *ne;
- STACK *sk;
+ STACK
_OF(X509_NAME_ENTRY)
*sk;
if (name == NULL) return(-1);
if (lastpos < 0)
lastpos= -1;
sk=name->entries;
if (name == NULL) return(-1);
if (lastpos < 0)
lastpos= -1;
sk=name->entries;
- n=sk_num(sk);
+ n=sk_
X509_NAME_ENTRY_
num(sk);
for (lastpos++; lastpos < n; lastpos++)
{
for (lastpos++; lastpos < n; lastpos++)
{
- ne=
(X509_NAME_ENTRY *)sk
_value(sk,lastpos);
+ ne=
sk_X509_NAME_ENTRY
_value(sk,lastpos);
if (OBJ_cmp(ne->object,obj) == 0)
return(lastpos);
}
if (OBJ_cmp(ne->object,obj) == 0)
return(lastpos);
}
@@
-128,32
+128,34
@@
int X509_NAME_get_index_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj,
X509_NAME_ENTRY *X509_NAME_get_entry(X509_NAME *name, int loc)
{
X509_NAME_ENTRY *X509_NAME_get_entry(X509_NAME *name, int loc)
{
- if ( (name == NULL) || (sk_num(name->entries) <= loc) || (loc < 0))
+ if(name == NULL || sk_X509_NAME_ENTRY_num(name->entries) <= loc
+ || loc < 0)
return(NULL);
else
return(NULL);
else
- return(
(X509_NAME_ENTRY *)sk
_value(name->entries,loc));
+ return(
sk_X509_NAME_ENTRY
_value(name->entries,loc));
}
X509_NAME_ENTRY *X509_NAME_delete_entry(X509_NAME *name, int loc)
{
X509_NAME_ENTRY *ret;
int i,n,set_prev,set_next;
}
X509_NAME_ENTRY *X509_NAME_delete_entry(X509_NAME *name, int loc)
{
X509_NAME_ENTRY *ret;
int i,n,set_prev,set_next;
- STACK *sk;
+ STACK
_OF(X509_NAME_ENTRY)
*sk;
- if ((name == NULL) || (sk_num(name->entries) <= loc) || (loc < 0))
+ if (name == NULL || sk_X509_NAME_ENTRY_num(name->entries) <= loc
+ || loc < 0)
return(NULL);
sk=name->entries;
return(NULL);
sk=name->entries;
- ret=
(X509_NAME_ENTRY *)sk
_delete(sk,loc);
- n=sk_num(sk);
+ ret=
sk_X509_NAME_ENTRY
_delete(sk,loc);
+ n=sk_
X509_NAME_ENTRY_
num(sk);
name->modified=1;
if (loc == n) return(ret);
/* else we need to fixup the set field */
if (loc != 0)
name->modified=1;
if (loc == n) return(ret);
/* else we need to fixup the set field */
if (loc != 0)
- set_prev=(
(X509_NAME_ENTRY *)sk
_value(sk,loc-1))->set;
+ set_prev=(
sk_X509_NAME_ENTRY
_value(sk,loc-1))->set;
else
set_prev=ret->set-1;
else
set_prev=ret->set-1;
- set_next=
((X509_NAME_ENTRY *)sk_value(sk,loc)
)->set;
+ set_next=
sk_X509_NAME_ENTRY_value(sk,loc
)->set;
/* set_prev is the previous set
* set is the current set
/* set_prev is the previous set
* set is the current set
@@
-165,7
+167,7
@@
X509_NAME_ENTRY *X509_NAME_delete_entry(X509_NAME *name, int loc)
* re-number down by 1 */
if (set_prev+1 < set_next)
for (i=loc; i<n; i++)
* re-number down by 1 */
if (set_prev+1 < set_next)
for (i=loc; i<n; i++)
-
((X509_NAME_ENTRY *)sk_value(sk,i)
)->set--;
+
sk_X509_NAME_ENTRY_value(sk,i
)->set--;
return(ret);
}
return(ret);
}
@@
-176,11
+178,11
@@
int X509_NAME_add_entry(X509_NAME *name, X509_NAME_ENTRY *ne, int loc,
{
X509_NAME_ENTRY *new_name=NULL;
int n,i,inc;
{
X509_NAME_ENTRY *new_name=NULL;
int n,i,inc;
- STACK *sk;
+ STACK
_OF(X509_NAME_ENTRY)
*sk;
if (name == NULL) return(0);
sk=name->entries;
if (name == NULL) return(0);
sk=name->entries;
- n=sk_num(sk);
+ n=sk_
X509_NAME_ENTRY_
num(sk);
if (loc > n) loc=n;
else if (loc < 0) loc=n;
if (loc > n) loc=n;
else if (loc < 0) loc=n;
@@
-195,7
+197,7
@@
int X509_NAME_add_entry(X509_NAME *name, X509_NAME_ENTRY *ne, int loc,
}
else
{
}
else
{
- set=
((X509_NAME_ENTRY *)sk_value(sk,loc-1)
)->set;
+ set=
sk_X509_NAME_ENTRY_value(sk,loc-1
)->set;
inc=0;
}
}
inc=0;
}
}
@@
-204,29
+206,28
@@
int X509_NAME_add_entry(X509_NAME *name, X509_NAME_ENTRY *ne, int loc,
if (loc >= n)
{
if (loc != 0)
if (loc >= n)
{
if (loc != 0)
- set=((X509_NAME_ENTRY *)
- sk_value(sk,loc-1))->set+1;
+ set=sk_X509_NAME_ENTRY_value(sk,loc-1)->set+1;
else
set=0;
}
else
else
set=0;
}
else
- set=
((X509_NAME_ENTRY *)sk_value(sk,loc)
)->set;
+ set=
sk_X509_NAME_ENTRY_value(sk,loc
)->set;
inc=(set == 0)?1:0;
}
if ((new_name=X509_NAME_ENTRY_dup(ne)) == NULL)
goto err;
new_name->set=set;
inc=(set == 0)?1:0;
}
if ((new_name=X509_NAME_ENTRY_dup(ne)) == NULL)
goto err;
new_name->set=set;
- if (!sk_
insert(sk,(char *)
new_name,loc))
+ if (!sk_
X509_NAME_ENTRY_insert(sk,
new_name,loc))
{
X509err(X509_F_X509_NAME_ADD_ENTRY,ERR_R_MALLOC_FAILURE);
goto err;
}
if (inc)
{
{
X509err(X509_F_X509_NAME_ADD_ENTRY,ERR_R_MALLOC_FAILURE);
goto err;
}
if (inc)
{
- n=sk_num(sk);
+ n=sk_
X509_NAME_ENTRY_
num(sk);
for (i=loc+1; i<n; i++)
for (i=loc+1; i<n; i++)
-
((X509_NAME_ENTRY *)sk_value(sk,i-1)
)->set+=1;
+
sk_X509_NAME_ENTRY_value(sk,i-1
)->set+=1;
}
return(1);
err:
}
return(1);
err: