v3_akey.c (55714) | v3_akey.c (59191) |
---|---|
1/* v3_akey.c */ 2/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL 3 * project 1999. 4 */ 5/* ==================================================================== 6 * Copyright (c) 1999 The OpenSSL Project. All rights reserved. 7 * 8 * Redistribution and use in source and binary forms, with or without --- 115 unchanged lines hidden (view full) --- 124 M_ASN1_D2I_get_IMP_opt (ret->serial, d2i_ASN1_INTEGER, 2, 125 V_ASN1_INTEGER); 126 M_ASN1_D2I_Finish(a, AUTHORITY_KEYID_free, ASN1_F_D2I_AUTHORITY_KEYID); 127} 128 129void AUTHORITY_KEYID_free(AUTHORITY_KEYID *a) 130{ 131 if (a == NULL) return; | 1/* v3_akey.c */ 2/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL 3 * project 1999. 4 */ 5/* ==================================================================== 6 * Copyright (c) 1999 The OpenSSL Project. All rights reserved. 7 * 8 * Redistribution and use in source and binary forms, with or without --- 115 unchanged lines hidden (view full) --- 124 M_ASN1_D2I_get_IMP_opt (ret->serial, d2i_ASN1_INTEGER, 2, 125 V_ASN1_INTEGER); 126 M_ASN1_D2I_Finish(a, AUTHORITY_KEYID_free, ASN1_F_D2I_AUTHORITY_KEYID); 127} 128 129void AUTHORITY_KEYID_free(AUTHORITY_KEYID *a) 130{ 131 if (a == NULL) return; |
132 ASN1_OCTET_STRING_free(a->keyid); | 132 M_ASN1_OCTET_STRING_free(a->keyid); |
133 sk_GENERAL_NAME_pop_free(a->issuer, GENERAL_NAME_free); | 133 sk_GENERAL_NAME_pop_free(a->issuer, GENERAL_NAME_free); |
134 ASN1_INTEGER_free (a->serial); 135 Free ((char *)a); | 134 M_ASN1_INTEGER_free (a->serial); 135 Free (a); |
136} 137 138static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, 139 AUTHORITY_KEYID *akeyid, STACK_OF(CONF_VALUE) *extlist) 140{ 141 char *tmp; 142 if(akeyid->keyid) { 143 tmp = hex_to_string(akeyid->keyid->data, akeyid->keyid->length); --- 65 unchanged lines hidden (view full) --- 209 if(keyid==2 && !ikeyid) { 210 X509V3err(X509V3_F_V2I_AUTHORITY_KEYID,X509V3_R_UNABLE_TO_GET_ISSUER_KEYID); 211 return NULL; 212 } 213} 214 215if((issuer && !ikeyid) || (issuer == 2)) { 216 isname = X509_NAME_dup(X509_get_issuer_name(cert)); | 136} 137 138static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, 139 AUTHORITY_KEYID *akeyid, STACK_OF(CONF_VALUE) *extlist) 140{ 141 char *tmp; 142 if(akeyid->keyid) { 143 tmp = hex_to_string(akeyid->keyid->data, akeyid->keyid->length); --- 65 unchanged lines hidden (view full) --- 209 if(keyid==2 && !ikeyid) { 210 X509V3err(X509V3_F_V2I_AUTHORITY_KEYID,X509V3_R_UNABLE_TO_GET_ISSUER_KEYID); 211 return NULL; 212 } 213} 214 215if((issuer && !ikeyid) || (issuer == 2)) { 216 isname = X509_NAME_dup(X509_get_issuer_name(cert)); |
217 serial = ASN1_INTEGER_dup(X509_get_serialNumber(cert)); | 217 serial = M_ASN1_INTEGER_dup(X509_get_serialNumber(cert)); |
218 if(!isname || !serial) { 219 X509V3err(X509V3_F_V2I_AUTHORITY_KEYID,X509V3_R_UNABLE_TO_GET_ISSUER_DETAILS); 220 goto err; 221 } 222} 223 224if(!(akeyid = AUTHORITY_KEYID_new())) goto err; 225 --- 10 unchanged lines hidden (view full) --- 236akeyid->issuer = gens; 237akeyid->serial = serial; 238akeyid->keyid = ikeyid; 239 240return akeyid; 241 242err: 243X509_NAME_free(isname); | 218 if(!isname || !serial) { 219 X509V3err(X509V3_F_V2I_AUTHORITY_KEYID,X509V3_R_UNABLE_TO_GET_ISSUER_DETAILS); 220 goto err; 221 } 222} 223 224if(!(akeyid = AUTHORITY_KEYID_new())) goto err; 225 --- 10 unchanged lines hidden (view full) --- 236akeyid->issuer = gens; 237akeyid->serial = serial; 238akeyid->keyid = ikeyid; 239 240return akeyid; 241 242err: 243X509_NAME_free(isname); |
244ASN1_INTEGER_free(serial); 245ASN1_OCTET_STRING_free(ikeyid); | 244M_ASN1_INTEGER_free(serial); 245M_ASN1_OCTET_STRING_free(ikeyid); |
246return NULL; 247 248} 249 | 246return NULL; 247 248} 249 |