| x509_r2x.c (59191) | x509_r2x.c (160814) |
|---|---|
| 1/* crypto/x509/x509_r2x.c */ 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 3 * All rights reserved. 4 * 5 * This package is an SSL implementation written 6 * by Eric Young (eay@cryptsoft.com). 7 * The implementation was written so as to conform with Netscapes SSL. 8 * --- 75 unchanged lines hidden (view full) --- 84 { 85 if ((xi->version=M_ASN1_INTEGER_new()) == NULL) goto err; 86 if (!ASN1_INTEGER_set(xi->version,2)) goto err; 87/* xi->extensions=ri->attributes; <- bad, should not ever be done 88 ri->attributes=NULL; */ 89 } 90 91 xn=X509_REQ_get_subject_name(r); | 1/* crypto/x509/x509_r2x.c */ 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 3 * All rights reserved. 4 * 5 * This package is an SSL implementation written 6 * by Eric Young (eay@cryptsoft.com). 7 * The implementation was written so as to conform with Netscapes SSL. 8 * --- 75 unchanged lines hidden (view full) --- 84 { 85 if ((xi->version=M_ASN1_INTEGER_new()) == NULL) goto err; 86 if (!ASN1_INTEGER_set(xi->version,2)) goto err; 87/* xi->extensions=ri->attributes; <- bad, should not ever be done 88 ri->attributes=NULL; */ 89 } 90 91 xn=X509_REQ_get_subject_name(r); |
| 92 X509_set_subject_name(ret,X509_NAME_dup(xn)); 93 X509_set_issuer_name(ret,X509_NAME_dup(xn)); | 92 if (X509_set_subject_name(ret,X509_NAME_dup(xn)) == 0) 93 goto err; 94 if (X509_set_issuer_name(ret,X509_NAME_dup(xn)) == 0) 95 goto err; |
| 94 | 96 |
| 95 X509_gmtime_adj(xi->validity->notBefore,0); 96 X509_gmtime_adj(xi->validity->notAfter,(long)60*60*24*days); | 97 if (X509_gmtime_adj(xi->validity->notBefore,0) == NULL) 98 goto err; 99 if (X509_gmtime_adj(xi->validity->notAfter,(long)60*60*24*days) == NULL) 100 goto err; |
| 97 98 X509_set_pubkey(ret,X509_REQ_get_pubkey(r)); 99 100 if (!X509_sign(ret,pkey,EVP_md5())) 101 goto err; 102 if (0) 103 { 104err: 105 X509_free(ret); 106 ret=NULL; 107 } 108 return(ret); 109 } 110 | 101 102 X509_set_pubkey(ret,X509_REQ_get_pubkey(r)); 103 104 if (!X509_sign(ret,pkey,EVP_md5())) 105 goto err; 106 if (0) 107 { 108err: 109 X509_free(ret); 110 ret=NULL; 111 } 112 return(ret); 113 } 114 |