From 91e3957fb0e38a5d5649f82e5d9f89dd0e85666f Mon Sep 17 00:00:00 2001 From: Mike DePaulo Date: Sat, 28 Mar 2015 09:50:31 -0400 Subject: Update openssl to version openssl-1.0.1m Conflicts: openssl/Makefile openssl/Makefile.bak openssl/crypto/cryptlib.c --- openssl/apps/vms_decc_init.c | 170 ++++++++++++++++++++----------------------- 1 file changed, 77 insertions(+), 93 deletions(-) (limited to 'openssl/apps/vms_decc_init.c') diff --git a/openssl/apps/vms_decc_init.c b/openssl/apps/vms_decc_init.c index f512c8f1b..3b6de1197 100644 --- a/openssl/apps/vms_decc_init.c +++ b/openssl/apps/vms_decc_init.c @@ -5,7 +5,7 @@ #ifdef USE_DECC_INIT -/* +/*- * 2010-04-26 SMS. * *---------------------------------------------------------------------- @@ -18,10 +18,9 @@ *---------------------------------------------------------------------- */ -#include -#include -#include - +# include +# include +# include /* Global storage. */ @@ -29,41 +28,38 @@ int decc_init_done = -1; - /* Structure to hold a DECC$* feature name and its desired value. */ -typedef struct -{ +typedef struct { char *name; int value; } decc_feat_t; - -/* Array of DECC$* feature names and their desired values. - * Note: DECC$ARGV_PARSE_STYLE is the urgent one. +/* + * Array of DECC$* feature names and their desired values. Note: + * DECC$ARGV_PARSE_STYLE is the urgent one. */ -decc_feat_t decc_feat_array[] = -{ - /* Preserve command-line case with SET PROCESS/PARSE_STYLE=EXTENDED */ - { "DECC$ARGV_PARSE_STYLE", 1 }, +decc_feat_t decc_feat_array[] = { + /* Preserve command-line case with SET PROCESS/PARSE_STYLE=EXTENDED */ + {"DECC$ARGV_PARSE_STYLE", 1}, - /* Preserve case for file names on ODS5 disks. */ - { "DECC$EFS_CASE_PRESERVE", 1 }, + /* Preserve case for file names on ODS5 disks. */ + {"DECC$EFS_CASE_PRESERVE", 1}, - /* Enable multiple dots (and most characters) in ODS5 file names, - * while preserving VMS-ness of ";version". - */ - { "DECC$EFS_CHARSET", 1 }, + /* + * Enable multiple dots (and most characters) in ODS5 file names, while + * preserving VMS-ness of ";version". + */ + {"DECC$EFS_CHARSET", 1}, - /* List terminator. */ - { (char *)NULL, 0 } + /* List terminator. */ + {(char *)NULL, 0} }; - /* LIB$INITIALIZE initialization function. */ -static void decc_init( void) +static void decc_init(void) { char *openssl_debug_decc_init; int verbose = 0; @@ -75,12 +71,10 @@ static void decc_init( void) int sts; /* Get debug option. */ - openssl_debug_decc_init = getenv( "OPENSSL_DEBUG_DECC_INIT"); - if (openssl_debug_decc_init != NULL) - { - verbose = strtol( openssl_debug_decc_init, NULL, 10); - if (verbose <= 0) - { + openssl_debug_decc_init = getenv("OPENSSL_DEBUG_DECC_INIT"); + if (openssl_debug_decc_init != NULL) { + verbose = strtol(openssl_debug_decc_init, NULL, 10); + if (verbose <= 0) { verbose = 1; } } @@ -90,99 +84,89 @@ static void decc_init( void) /* Loop through all items in the decc_feat_array[]. */ - for (i = 0; decc_feat_array[ i].name != NULL; i++) - { + for (i = 0; decc_feat_array[i].name != NULL; i++) { /* Get the feature index. */ - feat_index = decc$feature_get_index( decc_feat_array[ i].name); - if (feat_index >= 0) - { + feat_index = decc$feature_get_index(decc_feat_array[i].name); + if (feat_index >= 0) { /* Valid item. Collect its properties. */ - feat_value = decc$feature_get_value( feat_index, 1); - feat_value_min = decc$feature_get_value( feat_index, 2); - feat_value_max = decc$feature_get_value( feat_index, 3); + feat_value = decc$feature_get_value(feat_index, 1); + feat_value_min = decc$feature_get_value(feat_index, 2); + feat_value_max = decc$feature_get_value(feat_index, 3); /* Check the validity of our desired value. */ - if ((decc_feat_array[ i].value >= feat_value_min) && - (decc_feat_array[ i].value <= feat_value_max)) - { + if ((decc_feat_array[i].value >= feat_value_min) && + (decc_feat_array[i].value <= feat_value_max)) { /* Valid value. Set it if necessary. */ - if (feat_value != decc_feat_array[ i].value) - { - sts = decc$feature_set_value( feat_index, - 1, - decc_feat_array[ i].value); - - if (verbose > 1) - { - fprintf( stderr, " %s = %d, sts = %d.\n", - decc_feat_array[ i].name, - decc_feat_array[ i].value, - sts); - } + if (feat_value != decc_feat_array[i].value) { + sts = decc$feature_set_value(feat_index, + 1, decc_feat_array[i].value); + + if (verbose > 1) { + fprintf(stderr, " %s = %d, sts = %d.\n", + decc_feat_array[i].name, + decc_feat_array[i].value, sts); + } } - } - else - { + } else { /* Invalid DECC feature value. */ - fprintf( stderr, - " INVALID DECC$FEATURE VALUE, %d: %d <= %s <= %d.\n", - feat_value, - feat_value_min, decc_feat_array[ i].name, feat_value_max); + fprintf(stderr, + " INVALID DECC$FEATURE VALUE, %d: %d <= %s <= %d.\n", + feat_value, + feat_value_min, decc_feat_array[i].name, + feat_value_max); } - } - else - { + } else { /* Invalid DECC feature name. */ - fprintf( stderr, - " UNKNOWN DECC$FEATURE: %s.\n", decc_feat_array[ i].name); + fprintf(stderr, + " UNKNOWN DECC$FEATURE: %s.\n", decc_feat_array[i].name); } } - if (verbose > 0) - { - fprintf( stderr, " DECC_INIT complete.\n"); + if (verbose > 0) { + fprintf(stderr, " DECC_INIT complete.\n"); } } /* Get "decc_init()" into a valid, loaded LIB$INITIALIZE PSECT. */ -#pragma nostandard +# pragma nostandard -/* Establish the LIB$INITIALIZE PSECTs, with proper alignment and - * other attributes. Note that "nopic" is significant only on VAX. +/* + * Establish the LIB$INITIALIZE PSECTs, with proper alignment and other + * attributes. Note that "nopic" is significant only on VAX. */ -#pragma extern_model save +# pragma extern_model save -#if __INITIAL_POINTER_SIZE == 64 -# define PSECT_ALIGN 3 -#else -# define PSECT_ALIGN 2 -#endif +# if __INITIAL_POINTER_SIZE == 64 +# define PSECT_ALIGN 3 +# else +# define PSECT_ALIGN 2 +# endif -#pragma extern_model strict_refdef "LIB$INITIALIZ" PSECT_ALIGN, nopic, nowrt -const int spare[ 8] = { 0 }; +# pragma extern_model strict_refdef "LIB$INITIALIZ" PSECT_ALIGN, nopic, nowrt +const int spare[8] = { 0 }; -#pragma extern_model strict_refdef "LIB$INITIALIZE" PSECT_ALIGN, nopic, nowrt -void (*const x_decc_init)() = decc_init; +# pragma extern_model strict_refdef "LIB$INITIALIZE" PSECT_ALIGN, nopic, nowrt +void (*const x_decc_init) () = decc_init; -#pragma extern_model restore +# pragma extern_model restore /* Fake reference to ensure loading the LIB$INITIALIZE PSECT. */ -#pragma extern_model save +# pragma extern_model save -int LIB$INITIALIZE( void); +int LIB$INITIALIZE(void); -#pragma extern_model strict_refdef -int dmy_lib$initialize = (int) LIB$INITIALIZE; +# pragma extern_model strict_refdef +int dmy_lib$initialize = (int)LIB$INITIALIZE; -#pragma extern_model restore +# pragma extern_model restore -#pragma standard +# pragma standard -#else /* def USE_DECC_INIT */ +#else /* def USE_DECC_INIT */ /* Dummy code to avoid a %CC-W-EMPTYFILE complaint. */ -int decc_init_dummy( void); +int decc_init_dummy(void); -#endif /* def USE_DECC_INIT */ +#endif /* def USE_DECC_INIT */ -- cgit v1.2.3