projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Generalise OCSP I/O functions to support dowloading of other ASN1
[openssl.git]
/
crypto
/
x509
/
x509_set.c
diff --git
a/crypto/x509/x509_set.c
b/crypto/x509/x509_set.c
index 5d0a3a0c0e06cbb7cc4f8107c26b9ee554c9b81e..4b94fc58477f68af554a0698f685ec99fc434bb9 100644
(file)
--- a/
crypto/x509/x509_set.c
+++ b/
crypto/x509/x509_set.c
@@
-58,27
+58,23
@@
#include <stdio.h>
#include "cryptlib.h"
#include <stdio.h>
#include "cryptlib.h"
-#include
"asn1.h"
-#include
"objects.h"
-#include
"evp.h"
-#include
"x509.h"
+#include
<openssl/asn1.h>
+#include
<openssl/objects.h>
+#include
<openssl/evp.h>
+#include
<openssl/x509.h>
-int X509_set_version(x,version)
-X509 *x;
-long version;
+int X509_set_version(X509 *x, long version)
{
if (x == NULL) return(0);
if (x->cert_info->version == NULL)
{
{
if (x == NULL) return(0);
if (x->cert_info->version == NULL)
{
- if ((x->cert_info->version=ASN1_INTEGER_new()) == NULL)
+ if ((x->cert_info->version=
M_
ASN1_INTEGER_new()) == NULL)
return(0);
}
return(ASN1_INTEGER_set(x->cert_info->version,version));
}
return(0);
}
return(ASN1_INTEGER_set(x->cert_info->version,version));
}
-int X509_set_serialNumber(x,serial)
-X509 *x;
-ASN1_INTEGER *serial;
+int X509_set_serialNumber(X509 *x, ASN1_INTEGER *serial)
{
ASN1_INTEGER *in;
{
ASN1_INTEGER *in;
@@
-86,75
+82,65
@@
ASN1_INTEGER *serial;
in=x->cert_info->serialNumber;
if (in != serial)
{
in=x->cert_info->serialNumber;
if (in != serial)
{
- in=ASN1_INTEGER_dup(serial);
+ in=
M_
ASN1_INTEGER_dup(serial);
if (in != NULL)
{
if (in != NULL)
{
- ASN1_INTEGER_free(x->cert_info->serialNumber);
+
M_
ASN1_INTEGER_free(x->cert_info->serialNumber);
x->cert_info->serialNumber=in;
}
}
return(in != NULL);
}
x->cert_info->serialNumber=in;
}
}
return(in != NULL);
}
-int X509_set_issuer_name(x,name)
-X509 *x;
-X509_NAME *name;
+int X509_set_issuer_name(X509 *x, X509_NAME *name)
{
if ((x == NULL) || (x->cert_info == NULL)) return(0);
return(X509_NAME_set(&x->cert_info->issuer,name));
}
{
if ((x == NULL) || (x->cert_info == NULL)) return(0);
return(X509_NAME_set(&x->cert_info->issuer,name));
}
-int X509_set_subject_name(x,name)
-X509 *x;
-X509_NAME *name;
+int X509_set_subject_name(X509 *x, X509_NAME *name)
{
if ((x == NULL) || (x->cert_info == NULL)) return(0);
return(X509_NAME_set(&x->cert_info->subject,name));
}
{
if ((x == NULL) || (x->cert_info == NULL)) return(0);
return(X509_NAME_set(&x->cert_info->subject,name));
}
-int X509_set_notBefore(x,tm)
-X509 *x;
-ASN1_UTCTIME *tm;
+int X509_set_notBefore(X509 *x, const ASN1_TIME *tm)
{
{
- ASN1_
UTC
TIME *in;
+ ASN1_TIME *in;
if ((x == NULL) || (x->cert_info->validity == NULL)) return(0);
in=x->cert_info->validity->notBefore;
if (in != tm)
{
if ((x == NULL) || (x->cert_info->validity == NULL)) return(0);
in=x->cert_info->validity->notBefore;
if (in != tm)
{
- in=
ASN1_UTC
TIME_dup(tm);
+ in=
M_ASN1_
TIME_dup(tm);
if (in != NULL)
{
if (in != NULL)
{
-
ASN1_UTC
TIME_free(x->cert_info->validity->notBefore);
+
M_ASN1_
TIME_free(x->cert_info->validity->notBefore);
x->cert_info->validity->notBefore=in;
}
}
return(in != NULL);
}
x->cert_info->validity->notBefore=in;
}
}
return(in != NULL);
}
-int X509_set_notAfter(x,tm)
-X509 *x;
-ASN1_UTCTIME *tm;
+int X509_set_notAfter(X509 *x, const ASN1_TIME *tm)
{
{
- ASN1_
UTC
TIME *in;
+ ASN1_TIME *in;
if ((x == NULL) || (x->cert_info->validity == NULL)) return(0);
in=x->cert_info->validity->notAfter;
if (in != tm)
{
if ((x == NULL) || (x->cert_info->validity == NULL)) return(0);
in=x->cert_info->validity->notAfter;
if (in != tm)
{
- in=
ASN1_UTC
TIME_dup(tm);
+ in=
M_ASN1_
TIME_dup(tm);
if (in != NULL)
{
if (in != NULL)
{
-
ASN1_UTC
TIME_free(x->cert_info->validity->notAfter);
+
M_ASN1_
TIME_free(x->cert_info->validity->notAfter);
x->cert_info->validity->notAfter=in;
}
}
return(in != NULL);
}
x->cert_info->validity->notAfter=in;
}
}
return(in != NULL);
}
-int X509_set_pubkey(x,pkey)
-X509 *x;
-EVP_PKEY *pkey;
+int X509_set_pubkey(X509 *x, EVP_PKEY *pkey)
{
if ((x == NULL) || (x->cert_info == NULL)) return(0);
return(X509_PUBKEY_set(&(x->cert_info->key),pkey));
{
if ((x == NULL) || (x->cert_info == NULL)) return(0);
return(X509_PUBKEY_set(&(x->cert_info->key),pkey));