wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix windows compile errors in params.c

Browse source 
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9569)
This commit is contained in:
Shane Lontis 2019-08-12 11:37:53 +10:00
parent 3119c84976
commit c04a9916d4
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
crypto/params.c
View file

@ -11,6 +11,7 @@
#include <string.h> #include <string.h>
#include <openssl/params.h> #include <openssl/params.h>
#include "internal/thread_once.h" #include "internal/thread_once.h"
#include "internal/numbers.h"
OSSL_PARAM *OSSL_PARAM_locate(OSSL_PARAM *p, const char *key) OSSL_PARAM *OSSL_PARAM_locate(OSSL_PARAM *p, const char *key)
{ {
@ -685,7 +686,7 @@ int OSSL_PARAM_set_double(OSSL_PARAM *p, double val)
return 1; return 1;
} }
} else if (p->data_type == OSSL_PARAM_UNSIGNED_INTEGER } else if (p->data_type == OSSL_PARAM_UNSIGNED_INTEGER
&& val == (uintmax_t)val) { && val == (ossl_uintmax_t)val) {
p->return_size = sizeof(double); p->return_size = sizeof(double);
switch (p->data_size) { switch (p->data_size) {
case sizeof(uint32_t): case sizeof(uint32_t):
@ -702,7 +703,7 @@ int OSSL_PARAM_set_double(OSSL_PARAM *p, double val)
return 1; return 1;
} }
break; } break; }
} else if (p->data_type == OSSL_PARAM_INTEGER && val == (intmax_t)val) { } else if (p->data_type == OSSL_PARAM_INTEGER && val == (ossl_intmax_t)val) {
p->return_size = sizeof(double); p->return_size = sizeof(double);
switch (p->data_size) { switch (p->data_size) {
case sizeof(int32_t): case sizeof(int32_t):