diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2010-06-23 17:10:50 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2010-06-23 17:10:50 +0000 |
| commit | 3096ea24e5321de222bf7fc42c23bf8eccf3599e (patch) | |
| tree | 5acfd1a21083d03720cca21c681f99e9862e8ec7 /usr.sbin | |
| parent | 57c9d664d178a52099d7b648e1ec1da86c19c639 (diff) | |
More appropriate contents for the exported ca tarball.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/ikectl/ikeca.c | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/usr.sbin/ikectl/ikeca.c b/usr.sbin/ikectl/ikeca.c index a4bda52a3f7..4c2a40fbb4e 100644 --- a/usr.sbin/ikectl/ikeca.c +++ b/usr.sbin/ikectl/ikeca.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ikeca.c,v 1.7 2010/06/23 16:01:01 jsg Exp $ */ +/* $OpenBSD: ikeca.c,v 1.8 2010/06/23 17:10:49 jsg Exp $ */ /* $vantronix: ikeca.c,v 1.13 2010/06/03 15:52:52 reyk Exp $ */ /* @@ -47,13 +47,6 @@ #define PATH_ZIP "/usr/local/bin/zip" #define PATH_TAR "/bin/tar" -const char *cafiles[] = { - "ca.crt", - "ca.pfx", - "private/ca.key", - "private/ca.pfx" -}; - struct ca { char sslpath[PATH_MAX]; char passfile[PATH_MAX]; @@ -62,7 +55,6 @@ struct ca { char *caname; }; - struct ca *ca_setup(char *, int); int ca_create(struct ca *); int ca_delete(struct ca *); @@ -469,11 +461,12 @@ ca_export(struct ca *ca, char *keyname, char *myname) u_int i; int fd; - if (keyname != NULL) - keyname = "ca"; - - if (strlcpy(oname, keyname, sizeof(oname)) >= sizeof(oname)) - err(1, "name too long"); + if (keyname != NULL) { + if (strlcpy(oname, keyname, sizeof(oname)) >= sizeof(oname)) + err(1, "name too long"); + } else { + strlcpy(oname, "ca", sizeof(oname)); + } /* colons are not valid characters in windows filenames... */ while ((p = strchr(oname, ':')) != NULL) @@ -562,8 +555,12 @@ ca_export(struct ca *ca, char *keyname, char *myname) } if (stat(PATH_TAR, &st) == 0) { - snprintf(cmd, sizeof(cmd), "%s -zcf %s.tgz -C %s .", PATH_TAR, - oname, p); + if (keyname == NULL) + snprintf(cmd, sizeof(cmd), "%s -zcf %s.tgz -C %s .", + PATH_TAR, oname, ca->sslpath); + else + snprintf(cmd, sizeof(cmd), "%s -zcf %s.tgz -C %s .", + PATH_TAR, oname, p); system(cmd); snprintf(src, sizeof(src), "%s.tgz", oname); if (realpath(src, dst) != NULL) |