|
@@ -23,16 +23,22 @@ int X509_set_version(X509 *x, long version)
|
|
|
{
|
|
|
if (x == NULL)
|
|
|
return 0;
|
|
|
- if (version == 0) {
|
|
|
+ if (version == X509_get_version(x))
|
|
|
+ return 1; /* avoid needless modification even re-allocation */
|
|
|
+ if (version == X509_VERSION_1) {
|
|
|
ASN1_INTEGER_free(x->cert_info.version);
|
|
|
x->cert_info.version = NULL;
|
|
|
+ x->cert_info.enc.modified = 1;
|
|
|
return 1;
|
|
|
}
|
|
|
if (x->cert_info.version == NULL) {
|
|
|
if ((x->cert_info.version = ASN1_INTEGER_new()) == NULL)
|
|
|
return 0;
|
|
|
}
|
|
|
- return ASN1_INTEGER_set(x->cert_info.version, version);
|
|
|
+ if (!ASN1_INTEGER_set(x->cert_info.version, version))
|
|
|
+ return 0;
|
|
|
+ x->cert_info.enc.modified = 1;
|
|
|
+ return 1;
|
|
|
}
|
|
|
|
|
|
int X509_set_serialNumber(X509 *x, ASN1_INTEGER *serial)
|
|
@@ -44,56 +50,66 @@ int X509_set_serialNumber(X509 *x, ASN1_INTEGER *serial)
|
|
|
in = &x->cert_info.serialNumber;
|
|
|
if (in != serial)
|
|
|
return ASN1_STRING_copy(in, serial);
|
|
|
+ x->cert_info.enc.modified = 1;
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
int X509_set_issuer_name(X509 *x, const X509_NAME *name)
|
|
|
{
|
|
|
- if (x == NULL)
|
|
|
+ if (x == NULL || !X509_NAME_set(&x->cert_info.issuer, name))
|
|
|
return 0;
|
|
|
- return X509_NAME_set(&x->cert_info.issuer, name);
|
|
|
+ x->cert_info.enc.modified = 1;
|
|
|
+ return 1;
|
|
|
}
|
|
|
|
|
|
int X509_set_subject_name(X509 *x, const X509_NAME *name)
|
|
|
{
|
|
|
- if (x == NULL)
|
|
|
+ if (x == NULL || !X509_NAME_set(&x->cert_info.subject, name))
|
|
|
return 0;
|
|
|
- return X509_NAME_set(&x->cert_info.subject, name);
|
|
|
+ x->cert_info.enc.modified = 1;
|
|
|
+ return 1;
|
|
|
}
|
|
|
|
|
|
-int ossl_x509_set1_time(ASN1_TIME **ptm, const ASN1_TIME *tm)
|
|
|
+int ossl_x509_set1_time(int *modified, ASN1_TIME **ptm, const ASN1_TIME *tm)
|
|
|
{
|
|
|
- ASN1_TIME *in;
|
|
|
- in = *ptm;
|
|
|
- if (in != tm) {
|
|
|
- in = ASN1_STRING_dup(tm);
|
|
|
- if (in != NULL) {
|
|
|
- ASN1_TIME_free(*ptm);
|
|
|
- *ptm = in;
|
|
|
- }
|
|
|
- }
|
|
|
- return (in != NULL);
|
|
|
+ ASN1_TIME *new;
|
|
|
+
|
|
|
+ if (*ptm == tm)
|
|
|
+ return 1;
|
|
|
+ new = ASN1_STRING_dup(tm);
|
|
|
+ if (tm != NULL && new == NULL)
|
|
|
+ return 0;
|
|
|
+ ASN1_TIME_free(*ptm);
|
|
|
+ *ptm = new;
|
|
|
+ if (modified != NULL)
|
|
|
+ *modified = 1;
|
|
|
+ return 1;
|
|
|
}
|
|
|
|
|
|
int X509_set1_notBefore(X509 *x, const ASN1_TIME *tm)
|
|
|
{
|
|
|
- if (x == NULL)
|
|
|
+ if (x == NULL || tm == NULL)
|
|
|
return 0;
|
|
|
- return ossl_x509_set1_time(&x->cert_info.validity.notBefore, tm);
|
|
|
+ return ossl_x509_set1_time(&x->cert_info.enc.modified,
|
|
|
+ &x->cert_info.validity.notBefore, tm);
|
|
|
}
|
|
|
|
|
|
int X509_set1_notAfter(X509 *x, const ASN1_TIME *tm)
|
|
|
{
|
|
|
- if (x == NULL)
|
|
|
+ if (x == NULL || tm == NULL)
|
|
|
return 0;
|
|
|
- return ossl_x509_set1_time(&x->cert_info.validity.notAfter, tm);
|
|
|
+ return ossl_x509_set1_time(&x->cert_info.enc.modified,
|
|
|
+ &x->cert_info.validity.notAfter, tm);
|
|
|
}
|
|
|
|
|
|
int X509_set_pubkey(X509 *x, EVP_PKEY *pkey)
|
|
|
{
|
|
|
if (x == NULL)
|
|
|
return 0;
|
|
|
- return X509_PUBKEY_set(&(x->cert_info.key), pkey);
|
|
|
+ if (!X509_PUBKEY_set(&(x->cert_info.key), pkey))
|
|
|
+ return 0;
|
|
|
+ x->cert_info.enc.modified = 1;
|
|
|
+ return 1;
|
|
|
}
|
|
|
|
|
|
int X509_up_ref(X509 *x)
|
|
@@ -105,7 +121,7 @@ int X509_up_ref(X509 *x)
|
|
|
|
|
|
REF_PRINT_COUNT("X509", x);
|
|
|
REF_ASSERT_ISNT(i < 2);
|
|
|
- return ((i > 1) ? 1 : 0);
|
|
|
+ return i > 1;
|
|
|
}
|
|
|
|
|
|
long X509_get_version(const X509 *x)
|