#include <stdio.h>
#include "cryptlib.h"
-#include "lhash.h"
-#include "objects.h"
-#include "x509.h"
-#include "buffer.h"
+#include <openssl/lhash.h>
+#include <openssl/objects.h>
+#include <openssl/x509.h>
+#include <openssl/buffer.h>
char *X509_NAME_oneline(X509_NAME *a, char *buf, int len)
{
X509_NAME_ENTRY *ne;
- unsigned int i;
+int i;
int n,lold,l,l1,l2,num,j,type;
const char *s;
char *p;
len--; /* space for '\0' */
l=0;
- for (i=0; (int)i<sk_num(a->entries); i++)
+ for (i=0; i<sk_X509_NAME_ENTRY_num(a->entries); i++)
{
- ne=(X509_NAME_ENTRY *)sk_value(a->entries,i);
+ ne=sk_X509_NAME_ENTRY_value(a->entries,i);
n=OBJ_obj2nid(ne->object);
if ((n == NID_undef) || ((s=OBJ_nid2sn(n)) == NULL))
{