summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2021-06-15 14:59:17 +0200
committerMatt Caswell <matt@openssl.org>2021-06-16 16:31:08 +0200
commit218e9969fd90ded078a1a558c110cd14e2272a35 (patch)
treee2c214ceba7f2fafaf33160571b51af58eda66e1 /crypto
parentTEST: Change 'catdir' to 'catfile' when dealing with files, in run_tests.pl (diff)
downloadopenssl-218e9969fd90ded078a1a558c110cd14e2272a35.tar.xz
openssl-218e9969fd90ded078a1a558c110cd14e2272a35.zip
DSO: Fix the VMS DSO name converter to actually do something
This function has never before actually done its work. This wasn't discovered before, because its output wasn't important before the FIPS provider self test started using its value. This function is now made to insert the VMS DSO extension (".EXE") at the end of the filename, being careful to make sure what can be a typical VMS generation number (separated from the file name with a ';') remains at the end. Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15765)
Diffstat (limited to 'crypto')
-rw-r--r--crypto/dso/dso_vms.c36
1 files changed, 31 insertions, 5 deletions
diff --git a/crypto/dso/dso_vms.c b/crypto/dso/dso_vms.c
index 1230a2c793..dd7402bfa2 100644
--- a/crypto/dso/dso_vms.c
+++ b/crypto/dso/dso_vms.c
@@ -453,11 +453,37 @@ static char *vms_merger(DSO *dso, const char *filespec1,
static char *vms_name_converter(DSO *dso, const char *filename)
{
- int len = strlen(filename);
- char *not_translated = OPENSSL_malloc(len + 1);
- if (not_translated != NULL)
- strcpy(not_translated, filename);
- return not_translated;
+ char *translated;
+ int len, transform;
+ const char *p;
+
+ len = strlen(filename);
+
+ p = strchr(filename, ':');
+ if (p != NULL) {
+ transform = 0;
+ } else {
+ p = filename;
+ transform = (strrchr(p, '>') == NULL && strrchr(p, ']') == NULL);
+ }
+
+ if (transform) {
+ int rsize = len + sizeof(DSO_EXTENSION);
+
+ if ((translated = OPENSSL_malloc(rsize)) != NULL) {
+ p = strrchr(filename, ';');
+ if (p != NULL)
+ len = p - filename;
+ strncpy(translated, filename, len);
+ translated[len] = '\0';
+ strcat(translated, DSO_EXTENSION);
+ if (p != NULL)
+ strcat(translated, p);
+ }
+ } else {
+ translated = OPENSSL_strdup(filename);
+ }
+ return translated;
}
#endif /* OPENSSL_SYS_VMS */