Mercurial > hg > orthanc
view OrthancFramework/Resources/Patches/openssl-3.1.0.patch @ 5253:1700fe5c9737 db-protobuf
integration mainline->db-protobuf
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Sat, 08 Apr 2023 11:44:05 +0200 |
parents | bd25d1c33362 |
children |
line wrap: on
line source
diff -urEb openssl-3.1.0.orig/crypto/riscvcap.c openssl-3.1.0/crypto/riscvcap.c --- openssl-3.1.0.orig/crypto/riscvcap.c 2023-03-14 13:59:07.000000000 +0100 +++ openssl-3.1.0/crypto/riscvcap.c 2023-04-04 17:18:21.018468423 +0200 @@ -37,7 +37,8 @@ static void strtoupper(char *str) { - for (char *x = str; *x; ++x) + char* x; + for (x = str; *x; ++x) *x = toupper(*x); } @@ -51,12 +52,13 @@ { char envstrupper[BUFLEN]; char buf[BUFLEN]; + size_t i; /* Convert env str to all uppercase */ OPENSSL_strlcpy(envstrupper, envstr, sizeof(envstrupper)); strtoupper(envstrupper); - for (size_t i = 0; i < kRISCVNumCaps; ++i) { + for (i = 0; i < kRISCVNumCaps; ++i) { /* Prefix capability with underscore in preparation for search */ BIO_snprintf(buf, BUFLEN, "_%s", RISCV_capabilities[i].name); if (strstr(envstrupper, buf) != NULL) { diff -urEb openssl-3.1.0.orig/providers/implementations/rands/seeding/rand_unix.c openssl-3.1.0/providers/implementations/rands/seeding/rand_unix.c --- openssl-3.1.0.orig/providers/implementations/rands/seeding/rand_unix.c 2023-03-14 13:59:07.000000000 +0100 +++ openssl-3.1.0/providers/implementations/rands/seeding/rand_unix.c 2023-04-04 17:17:43.874649403 +0200 @@ -452,6 +452,7 @@ * system call and this should always succeed which renders * this alternative but essentially identical source moot. */ +#if !defined(__LSB_VERSION__) // "syscall()" is not available in LSB if (uname(&un) == 0) { kernel[0] = atoi(un.release); p = strchr(un.release, '.'); @@ -462,6 +463,7 @@ return 0; } } +#endif /* Open /dev/random and wait for it to be readable */ if ((fd = open(DEVRANDOM_WAIT, O_RDONLY)) != -1) { if (DEVRANDM_WAIT_USE_SELECT && fd < FD_SETSIZE) {