- {
- X509 *x;
- EVP_PKEY *pk;
- RSA *rsa;
- char *s;
- X509_NAME *name=NULL;
- X509_NAME_ENTRY *ne=NULL;
- X509_EXTENSION *ex=NULL;
- ASN1_OCTET_STRING *data=NULL;
-
-
- if ((pkeyp == NULL) || (*pkeyp == NULL))
- {
- if ((pk=EVP_PKEY_new()) == NULL)
- {
- abort();
- return(0);
- }
- }
- else
- pk= *pkeyp;
-
- if ((x509p == NULL) || (*x509p == NULL))
- {
- if ((x=X509_new()) == NULL)
- goto err;
- }
- else
- x= *x509p;
-
- rsa=RSA_generate_key(bits,RSA_F4,callback);
- if (!EVP_PKEY_assign_RSA(pk,rsa))
- {
- abort();
- goto err;
- }
- rsa=NULL;
-
- X509_set_version(x,3);
- ASN1_INTEGER_set(X509_get_serialNumber(x),serial);
- X509_gmtime_adj(X509_get_notBefore(x),0);
- X509_gmtime_adj(X509_get_notAfter(x),(long)60*60*24*days);
- X509_set_pubkey(x,pk);
-
- name=X509_NAME_new();
-
- ne=X509_NAME_ENTRY_create_by_NID(NULL,NID_countryName,
- V_ASN1_APP_CHOOSE,"AU",-1);
- X509_NAME_add_entry(name,ne,0,0);
-
- X509_NAME_ENTRY_create_by_NID(&ne,NID_commonName,
- V_ASN1_APP_CHOOSE,"Eric Young",-1);
- X509_NAME_add_entry(name,ne,1,0);
-
- /* finished with structure */
- X509_NAME_ENTRY_free(ne);
-
- X509_set_subject_name(x,name);
- X509_set_issuer_name(x,name);
-
- /* finished with structure */
- X509_NAME_free(name);
-
- data=X509v3_pack_string(NULL,V_ASN1_BIT_STRING,
- "\001",1);
- ex=X509_EXTENSION_create_by_NID(NULL,NID_netscape_cert_type,0,data);
- X509_add_ext(x,ex,-1);
-
- X509v3_pack_string(&data,V_ASN1_IA5STRING,
- "example comment extension",-1);
- X509_EXTENSION_create_by_NID(&ex,NID_netscape_comment,0,data);
- X509_add_ext(x,ex,-1);
-
- X509v3_pack_string(&data,V_ASN1_BIT_STRING,
- "www.cryptsoft.com",-1);
- X509_EXTENSION_create_by_NID(&ex,NID_netscape_ssl_server_name,0,data);
- X509_add_ext(x,ex,-1);
-
- X509_EXTENSION_free(ex);
- ASN1_OCTET_STRING_free(data);
-
- if (!X509_sign(x,pk,EVP_md5()))
- goto err;
-
- *x509p=x;
- *pkeyp=pk;
- return(1);
-err:
- return(0);
- }
-
+{
+ X509 *x;
+ EVP_PKEY *pk;
+ RSA *rsa;
+ X509_NAME *name = NULL;
+ X509_NAME_ENTRY *ne = NULL;
+ X509_EXTENSION *ex = NULL;
+
+ if ((pkeyp == NULL) || (*pkeyp == NULL)) {
+ if ((pk = EVP_PKEY_new()) == NULL) {
+ abort();
+ return (0);
+ }
+ } else
+ pk = *pkeyp;
+
+ if ((x509p == NULL) || (*x509p == NULL)) {
+ if ((x = X509_new()) == NULL)
+ goto err;
+ } else
+ x = *x509p;
+
+ rsa = RSA_generate_key(bits, RSA_F4, callback, NULL);
+ if (!EVP_PKEY_assign_RSA(pk, rsa)) {
+ abort();
+ goto err;
+ }
+ rsa = NULL;
+
+ X509_set_version(x, 3);
+ ASN1_INTEGER_set(X509_get_serialNumber(x), serial);
+ X509_gmtime_adj(X509_get_notBefore(x), 0);
+ X509_gmtime_adj(X509_get_notAfter(x), (long)60 * 60 * 24 * days);
+ X509_set_pubkey(x, pk);
+
+ name = X509_get_subject_name(x);
+
+ /*
+ * This function creates and adds the entry, working out the correct
+ * string type and performing checks on its length. Normally we'd check
+ * the return value for errors...
+ */
+ X509_NAME_add_entry_by_txt(name, "C", MBSTRING_ASC, "UK", -1, -1, 0);
+ X509_NAME_add_entry_by_txt(name, "CN",
+ MBSTRING_ASC, "OpenSSL Group", -1, -1, 0);
+
+ X509_set_issuer_name(x, name);
+
+ /*
+ * Add extension using V3 code: we can set the config file as NULL
+ * because we wont reference any other sections. We can also set the
+ * context to NULL because none of these extensions below will need to
+ * access it.
+ */
+
+ ex = X509V3_EXT_conf_nid(NULL, NULL, NID_netscape_cert_type, "server");
+ X509_add_ext(x, ex, -1);
+ X509_EXTENSION_free(ex);
+
+ ex = X509V3_EXT_conf_nid(NULL, NULL, NID_netscape_comment,
+ "example comment extension");
+ X509_add_ext(x, ex, -1);
+ X509_EXTENSION_free(ex);
+
+ ex = X509V3_EXT_conf_nid(NULL, NULL, NID_netscape_ssl_server_name,
+ "www.openssl.org");
+
+ X509_add_ext(x, ex, -1);
+ X509_EXTENSION_free(ex);
+
+#ifdef ADD_CA_CONSTRAINT
+ /* might want something like this too.... */
+ ex = X509V3_EXT_conf_nid(NULL, NULL, NID_basic_constraints,
+ "critical,CA:TRUE");
+
+ X509_add_ext(x, ex, -1);
+ X509_EXTENSION_free(ex);
+#endif