projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3b7ee47
)
* add possibility to specify SSL credentials for self-signet certificates so one...
author
Wilfried Göesgens
<willi@citadel.org>
Tue, 11 Aug 2009 22:01:27 +0000
(22:01 +0000)
committer
Wilfried Göesgens
<willi@citadel.org>
Tue, 11 Aug 2009 22:01:27 +0000
(22:01 +0000)
webcit/crypto.c
patch
|
blob
|
history
diff --git
a/webcit/crypto.c
b/webcit/crypto.c
index 2e630849160fb3266a5fe998cc294125050183fa..534e617e9e96ddc528a030c09df867d79fe307b9 100644
(file)
--- a/
webcit/crypto.c
+++ b/
webcit/crypto.c
@@
-187,7
+187,7
@@
void init_ssl(void)
if (pk=EVP_PKEY_new(), pk != NULL) {
EVP_PKEY_assign_RSA(pk, rsa);
if (req = X509_REQ_new(), req != NULL) {
if (pk=EVP_PKEY_new(), pk != NULL) {
EVP_PKEY_assign_RSA(pk, rsa);
if (req = X509_REQ_new(), req != NULL) {
-
+ const char *env;
/* Set the public key */
X509_REQ_set_pubkey(req, pk);
X509_REQ_set_version(req, 0L);
/* Set the public key */
X509_REQ_set_pubkey(req, pk);
X509_REQ_set_version(req, 0L);
@@
-211,24
+211,37
@@
void init_ssl(void)
MBSTRING_ASC, "Mount Kisco", -1, -1, 0);
*/
MBSTRING_ASC, "Mount Kisco", -1, -1, 0);
*/
+ env = getenv("O");
+ if (env == NULL)
+ env = "Organization name",
+
X509_NAME_add_entry_by_txt(
name, "O",
MBSTRING_ASC,
X509_NAME_add_entry_by_txt(
name, "O",
MBSTRING_ASC,
- (unsigned char*)
"Organization name",
+ (unsigned char*)
env,
-1, -1, 0
);
-1, -1, 0
);
+ env = getenv("OU");
+ if (env == NULL)
+ env = "Citadel server";
+
X509_NAME_add_entry_by_txt(
name, "OU",
MBSTRING_ASC,
X509_NAME_add_entry_by_txt(
name, "OU",
MBSTRING_ASC,
- (unsigned char*)
"Citadel server1",
+ (unsigned char*)
env,
-1, -1, 0
);
-1, -1, 0
);
+ env = getenv("O");
+ if (env == NULL)
+ env = "*";
+
X509_NAME_add_entry_by_txt(
name, "CN",
MBSTRING_ASC,
X509_NAME_add_entry_by_txt(
name, "CN",
MBSTRING_ASC,
- (unsigned char*)"*", -1, -1, 0
+ (unsigned char*)env,
+ -1, -1, 0
);
X509_REQ_set_subject_name(req, name);
);
X509_REQ_set_subject_name(req, name);