components/libpki/patches/04-studio.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Fri, 16 Dec 2016 19:19:44 -0800
changeset 7503 28ccedbcd04c
parent 5897 495a9e2444e4
permissions -rw-r--r--
Added tag s12-115 for changeset 71060ae349b6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5897
495a9e2444e4 PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
     1
Patch origin: in-house
495a9e2444e4 PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
     2
Patch status: Solaris-specific; not suitable for upstream
495a9e2444e4 PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
     3
495a9e2444e4 PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
     4
Need to add a dummy variable to struct dsa because Studio doesn't allow
495a9e2444e4 PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
     5
zero-sized struct/union.
495a9e2444e4 PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
     6
495a9e2444e4 PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
     7
void function cannot return value. gcc just ignores it, but Studio considers
495a9e2444e4 PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
     8
it as an error.
495a9e2444e4 PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
     9
495a9e2444e4 PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    10
--- libpki-0.8.9/src/libpki/openssl/data_st.h	2015-11-10 13:50:27.428271277 -0800
495a9e2444e4 PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    11
+++ libpki-0.8.9/src/libpki/openssl/data_st.h	2016-02-05 10:23:52.741804145 -0800
495a9e2444e4 PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    12
@@ -425,7 +425,9 @@
495a9e2444e4 PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    13
 		int exponent;
495a9e2444e4 PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    14
 	} rsa;
495a9e2444e4 PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    15
 	// DSA scheme parameters
495a9e2444e4 PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    16
-	struct {} dsa;
495a9e2444e4 PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    17
+	struct {
495a9e2444e4 PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    18
+		int dummy;
495a9e2444e4 PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    19
+	} dsa;
495a9e2444e4 PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    20
 
495a9e2444e4 PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    21
 #ifdef ENABLE_ECDSA
495a9e2444e4 PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    22
 	// EC scheme parameters
495a9e2444e4 PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    23
--- libpki-0.8.9/src/pki_mem.c	2015-11-10 13:50:29.132816749 -0800
495a9e2444e4 PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    24
+++ libpki-0.8.9/src/pki_mem.c	2016-02-05 10:42:12.359660890 -0800
495a9e2444e4 PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    25
@@ -322,7 +322,10 @@
495a9e2444e4 PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    26
 	if (!pnt) return;
495a9e2444e4 PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    27
 
495a9e2444e4 PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    28
 	/* If No size is provided, normal PKI_Free() is used */
495a9e2444e4 PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    29
-	if ( size <= 0 ) return PKI_Free ( pnt );
495a9e2444e4 PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    30
+	if ( size <= 0 ) {
495a9e2444e4 PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    31
+		PKI_Free ( pnt );
495a9e2444e4 PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    32
+		return;
495a9e2444e4 PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    33
+	}
495a9e2444e4 PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    34
 
495a9e2444e4 PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    35
 	/* Zeroize the Memory */
495a9e2444e4 PSARC/2016/220 libPKI
naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
parents:
diff changeset
    36
 	memset( pnt, '\xFF', size );