generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Another safe stack.

Browse Source
This commit is contained in:
Ben Laurie 1999-05-30 15:40:21 +00:00
parent ee8ba0b26c
commit e5e932d212
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/nseq.c
View File

@ -123,11 +123,11 @@ int MAIN(int argc, char **argv)
if (toseq) { if (toseq) {
seq = NETSCAPE_CERT_SEQUENCE_new(); seq = NETSCAPE_CERT_SEQUENCE_new();
seq->certs = sk_new(NULL); seq->certs = sk_X509_new(NULL);
while((x509 = PEM_read_bio_X509(in, NULL, NULL))) while((x509 = PEM_read_bio_X509(in, NULL, NULL)))
sk_push(seq->certs, (char *)x509); sk_X509_push(seq->certs,x509);
if(!sk_num(seq->certs)) if(!sk_X509_num(seq->certs))
{ {
BIO_printf (bio_err, "Error reading certs file %s\n", infile); BIO_printf (bio_err, "Error reading certs file %s\n", infile);
ERR_print_errors(bio_err); ERR_print_errors(bio_err);
@ -144,8 +144,8 @@ int MAIN(int argc, char **argv)
goto end; goto end;
} }
for(i = 0; i < sk_num(seq->certs); i++) { for(i = 0; i < sk_X509_num(seq->certs); i++) {
x509 = (X509 *) sk_value(seq->certs, i); x509 = sk_X509_value(seq->certs, i);
dump_cert_text(out, x509); dump_cert_text(out, x509);
PEM_write_bio_X509(out, x509); PEM_write_bio_X509(out, x509);
} }

18
crypto/asn1/nsseq.c
View File

@ -70,14 +70,14 @@ int i2d_NETSCAPE_CERT_SEQUENCE(NETSCAPE_CERT_SEQUENCE *a, unsigned char **pp)
int v = 0; int v = 0;
M_ASN1_I2D_vars(a); M_ASN1_I2D_vars(a);
M_ASN1_I2D_len (a->type, i2d_ASN1_OBJECT); M_ASN1_I2D_len (a->type, i2d_ASN1_OBJECT);
M_ASN1_I2D_len_EXP_SEQUENCE_opt(a->certs, i2d_X509, 0, M_ASN1_I2D_len_EXP_SEQUENCE_opt_type(X509,a->certs,i2d_X509,0,
V_ASN1_SEQUENCE, v); V_ASN1_SEQUENCE,v);
M_ASN1_I2D_seq_total(); M_ASN1_I2D_seq_total();
M_ASN1_I2D_put (a->type, i2d_ASN1_OBJECT); M_ASN1_I2D_put (a->type, i2d_ASN1_OBJECT);
M_ASN1_I2D_put_EXP_SEQUENCE_opt(a->certs, i2d_X509, 0, M_ASN1_I2D_put_EXP_SEQUENCE_opt_type(X509,a->certs,i2d_X509,0,
V_ASN1_SEQUENCE, v); V_ASN1_SEQUENCE,v);
M_ASN1_I2D_finish(); M_ASN1_I2D_finish();
} }
@ -102,15 +102,17 @@ NETSCAPE_CERT_SEQUENCE *d2i_NETSCAPE_CERT_SEQUENCE(NETSCAPE_CERT_SEQUENCE **a,
M_ASN1_D2I_Init(); M_ASN1_D2I_Init();
M_ASN1_D2I_start_sequence(); M_ASN1_D2I_start_sequence();
M_ASN1_D2I_get (ret->type, d2i_ASN1_OBJECT); M_ASN1_D2I_get (ret->type, d2i_ASN1_OBJECT);
M_ASN1_D2I_get_EXP_set_opt(ret->certs, d2i_X509, X509_free, 0, M_ASN1_D2I_get_EXP_set_opt_type(X509,ret->certs,d2i_X509,X509_free,0,
V_ASN1_SEQUENCE); V_ASN1_SEQUENCE);
M_ASN1_D2I_Finish(a, NETSCAPE_CERT_SEQUENCE_free, ASN1_F_D2I_NETSCAPE_CERT_SEQUENCE); M_ASN1_D2I_Finish(a, NETSCAPE_CERT_SEQUENCE_free,
ASN1_F_D2I_NETSCAPE_CERT_SEQUENCE);
} }
void NETSCAPE_CERT_SEQUENCE_free (NETSCAPE_CERT_SEQUENCE *a) void NETSCAPE_CERT_SEQUENCE_free (NETSCAPE_CERT_SEQUENCE *a)
{ {
if (a == NULL) return; if (a == NULL) return;
ASN1_OBJECT_free(a->type); ASN1_OBJECT_free(a->type);
if(a->certs) sk_pop_free(a->certs, X509_free); if(a->certs)
Free ((char *)a); sk_X509_pop_free(a->certs, X509_free);
Free (a);
} }

2
crypto/x509/x509.h
View File

@ -331,7 +331,7 @@ typedef struct Netscape_spki_st
typedef struct Netscape_certificate_sequence typedef struct Netscape_certificate_sequence
{ {
ASN1_OBJECT *type; ASN1_OBJECT *type;
STACK /* X509 */ *certs; STACK_OF(X509) *certs;
} NETSCAPE_CERT_SEQUENCE; } NETSCAPE_CERT_SEQUENCE;
#ifndef HEADER_BN_H #ifndef HEADER_BN_H