*/
#include <stdio.h>
-#include "cryptlib.h"
+#include "internal/cryptlib.h"
#include <openssl/asn1.h>
#include <openssl/objects.h>
#include <openssl/evp.h>
if (x == NULL)
return (0);
if (version == 0) {
- M_ASN1_INTEGER_free(x->cert_info->version);
+ ASN1_INTEGER_free(x->cert_info->version);
x->cert_info->version = NULL;
return (1);
}
if (x->cert_info->version == NULL) {
- if ((x->cert_info->version = M_ASN1_INTEGER_new()) == NULL)
+ if ((x->cert_info->version = ASN1_INTEGER_new()) == NULL)
return (0);
}
return (ASN1_INTEGER_set(x->cert_info->version, version));
return (0);
in = x->cert_info->serialNumber;
if (in != serial) {
- in = M_ASN1_INTEGER_dup(serial);
+ in = ASN1_INTEGER_dup(serial);
if (in != NULL) {
- M_ASN1_INTEGER_free(x->cert_info->serialNumber);
+ ASN1_INTEGER_free(x->cert_info->serialNumber);
x->cert_info->serialNumber = in;
}
}
{
ASN1_TIME *in;
- if ((x == NULL) || (x->cert_info->validity == NULL))
+ if (x == NULL)
return (0);
- in = x->cert_info->validity->notBefore;
+ in = x->cert_info->validity.notBefore;
if (in != tm) {
- in = M_ASN1_TIME_dup(tm);
+ in = ASN1_STRING_dup(tm);
if (in != NULL) {
- M_ASN1_TIME_free(x->cert_info->validity->notBefore);
- x->cert_info->validity->notBefore = in;
+ ASN1_TIME_free(x->cert_info->validity.notBefore);
+ x->cert_info->validity.notBefore = in;
}
}
return (in != NULL);
{
ASN1_TIME *in;
- if ((x == NULL) || (x->cert_info->validity == NULL))
+ if (x == NULL)
return (0);
- in = x->cert_info->validity->notAfter;
+ in = x->cert_info->validity.notAfter;
if (in != tm) {
- in = M_ASN1_TIME_dup(tm);
+ in = ASN1_STRING_dup(tm);
if (in != NULL) {
- M_ASN1_TIME_free(x->cert_info->validity->notAfter);
- x->cert_info->validity->notAfter = in;
+ ASN1_TIME_free(x->cert_info->validity.notAfter);
+ x->cert_info->validity.notAfter = in;
}
}
return (in != NULL);
return (0);
return (X509_PUBKEY_set(&(x->cert_info->key), pkey));
}
+
+void X509_up_ref(X509 *x)
+{
+ CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509);
+}
+
+long X509_get_version(X509 *x)
+{
+ return ASN1_INTEGER_get(x->cert_info->version);
+}
+
+ASN1_TIME * X509_get_notBefore(X509 *x)
+{
+ return x->cert_info->validity.notBefore;
+}
+
+ASN1_TIME *X509_get_notAfter(X509 *x)
+{
+ return x->cert_info->validity.notAfter;
+}
+
+int X509_get_signature_type(const X509 *x)
+{
+ return EVP_PKEY_type(OBJ_obj2nid(x->sig_alg->algorithm));
+}
+
+X509_PUBKEY *X509_get_X509_PUBKEY(const X509 *x)
+{
+ return x->cert_info->key;
+}