View | Details | Raw Unified
Collapse All | Expand All

(-) xca-0.5.1.org/lib/asn1time.cpp (-1 / +1 lines)
 Lines 250-256   unsigned char *a1time::d2i(unsigned char Link Here 
	unsigned char *mp = p;
	unsigned char *mp = p;
	if (time)
	if (time)
		ASN1_TIME_free(time);
		ASN1_TIME_free(time);
	time = d2i_ASN1_TIME(NULL, &mp, size);
	time = d2i_ASN1_TIME(NULL, (const unsigned char **)&mp, size);
	return mp;
	return mp;
}
}
(-) xca-0.5.1.org/lib/pki_crl.cpp (-1 / +1 lines)
 Lines 131-137   pki_crl::~pki_crl() Link Here 
void pki_crl::fromData(unsigned char *p, int size)
void pki_crl::fromData(unsigned char *p, int size)
{
{
	X509_CRL *crl_sik = crl;
	X509_CRL *crl_sik = crl;
	crl = d2i_X509_CRL(NULL, &p, size);
	crl = d2i_X509_CRL(NULL, (const unsigned char **)&p, size);
	if (crl)
	if (crl)
		X509_CRL_free(crl_sik);
		X509_CRL_free(crl_sik);
	else
	else
(-) xca-0.5.1.org/lib/pki_key.cpp (-2 / +2 lines)
 Lines 107-113   pki_key::pki_key(const pki_key *pk) Link Here 
	if (pk == NULL) return;
	if (pk == NULL) return;
	key->type = pk->key->type;
	key->type = pk->key->type;
	if (key->type == EVP_PKEY_RSA) {
	if (key->type == EVP_PKEY_RSA) {
		key->pkey.rsa=((RSA *)ASN1_dup( (int (*)())i2d_RSAPrivateKey, (char *(*)())d2i_RSAPrivateKey,(char *)pk->key->pkey.rsa));
		key->pkey.rsa=ASN1_dup_of_const(RSA, i2d_RSAPrivateKey, d2i_RSAPrivateKey, pk->key->pkey.rsa);
	}
	}
	// TODO add DSA support.....	
	// TODO add DSA support.....	
	openssl_error();
	openssl_error();
 Lines 216-222   void pki_key::fromData(unsigned char *p, Link Here 
		rsakey = d2i_RSAPrivateKey(NULL, &pdec, decsize);
		rsakey = d2i_RSAPrivateKey(NULL, &pdec, decsize);
#endif
#endif
		if (ign_openssl_error()) {
		if (ign_openssl_error()) {
			rsakey = d2i_RSA_PUBKEY(NULL, &sik, decsize);
			rsakey = d2i_RSA_PUBKEY(NULL, (const unsigned char **)&sik, decsize);
		}
		}
		openssl_error(); 
		openssl_error(); 
		if (rsakey) EVP_PKEY_assign_RSA(key, rsakey);
		if (rsakey) EVP_PKEY_assign_RSA(key, rsakey);
(-) xca-0.5.1.org/lib/pki_x509.cpp (-2 / +2 lines)
 Lines 276-282   void pki_x509::fromData(unsigned char *p Link Here 
	version = intFromData(&p1);
	version = intFromData(&p1);
	if (version >=1 || version <= 4) {
	if (version >=1 || version <= 4) {
		sCert = intFromData(&p1);
		sCert = intFromData(&p1);
		cert = d2i_X509(NULL, &p1, sCert);
		cert = d2i_X509(NULL, (const unsigned char **)&p1, sCert);
		trust = intFromData(&p1);
		trust = intFromData(&p1);
		sRev = intFromData(&p1);
		sRev = intFromData(&p1);
		if (sRev) {
		if (sRev) {
 Lines 314-320   void pki_x509::fromData(unsigned char *p Link Here 
		// version 3 did save a recent date :-((
		// version 3 did save a recent date :-((
	}
	}
	else { // old version
	else { // old version
		cert = d2i_X509(NULL, &p, size);
		cert = d2i_X509(NULL, (const unsigned char **)&p, size);
		revoked = NULL;
		revoked = NULL;
		trust = 1;
		trust = 1;
		efftrust = 1;
		efftrust = 1;
(-) xca-0.5.1.org/lib/pki_x509req.cpp (-3 / +3 lines)
 Lines 134-142   void pki_x509req::fromData(unsigned char Link Here 
{
{
	unsigned char *ps = p;
	unsigned char *ps = p;
	privkey = NULL;
	privkey = NULL;
	request = d2i_X509_REQ(&request, &ps, size);
	request = d2i_X509_REQ(&request, (const unsigned char **)&ps, size);
	if (ps - p < size)
	if (ps - p < size)
		spki = d2i_NETSCAPE_SPKI(NULL, &ps , size + p - ps); 
		spki = d2i_NETSCAPE_SPKI(NULL, (const unsigned char **)&ps , size + p - ps); 
	openssl_error();
	openssl_error();
}
}
 Lines 257-263   void pki_x509req::setSPKIFromData(unsign Link Here 
{
{
	NETSCAPE_SPKI *spki = NULL;
	NETSCAPE_SPKI *spki = NULL;
	spki = d2i_NETSCAPE_SPKI(NULL,&p,size);
	spki = d2i_NETSCAPE_SPKI(NULL,(const unsigned char **)&p,size);
	if (spki == NULL) goto err;
	if (spki == NULL) goto err;
	set_spki (spki);
	set_spki (spki);
(-) xca-0.5.1.org/lib/x509name.cpp (-1 / +1 lines)
 Lines 149-155   unsigned char *x509name::d2i(unsigned ch Link Here 
{
{
	unsigned char *mp = p;
	unsigned char *mp = p;
	X509_NAME *xn_sik = xn;
	X509_NAME *xn_sik = xn;
	xn = d2i_X509_NAME(NULL, &mp, size);
	xn = d2i_X509_NAME(NULL, (const unsigned char **)&mp, size);
	if (xn == NULL)
	if (xn == NULL)
		xn = xn_sik;
		xn = xn_sik;
	else
	else
(-) xca-0.5.1.org/lib/x509rev.cpp (-3 / +2 lines)
 Lines 50-58    Link Here 
#include "x509rev.h"
#include "x509rev.h"
#define X509_REVOKED_dup(x5r) (X509_REVOKED *)ASN1_dup((int (*)())i2d_X509_REVOKED, \
#define X509_REVOKED_dup(x5r) ASN1_dup_of (X509_REVOKED, i2d_X509_REVOKED, d2i_X509_REVOKED, x5r)
		(char *(*)())d2i_X509_REVOKED,(char *)x5r)
	
x509rev::x509rev()
x509rev::x509rev()
{
{
	rev = X509_REVOKED_new();
	rev = X509_REVOKED_new();