components/libpki/patches/04-studio.patch
author Jan Parcel <jan.parcel@oracle.com>
Wed, 06 Jul 2016 18:39:47 -0700
branchs11u3-sru
changeset 6360 9d123b58131d
permissions -rw-r--r--
PSARC/2016/217 Smartcard Reintroduction PSARC/2016/220 libPKI PSARC/2016/365 Mediated implementation of libpki in Solaris 11.3 22673523 Add libpki v0.8.9 to Userland consolidation 23535842 Mediated implementation of libpki in Solaris 11.3 23528052 libpki's configure and Makefile need refactoring
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
6360
9d123b58131d PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
     1
Patch origin: in-house
9d123b58131d PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
     2
Patch status: Solaris-specific; not suitable for upstream
9d123b58131d PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
     3
9d123b58131d PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
     4
Need to add a dummy variable to struct dsa because Studio doesn't allow
9d123b58131d PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
     5
zero-sized struct/union.
9d123b58131d PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
     6
9d123b58131d PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
     7
void function cannot return value. gcc just ignores it, but Studio considers
9d123b58131d PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
     8
it as an error.
9d123b58131d PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
     9
9d123b58131d PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    10
--- libpki-0.8.9/src/libpki/openssl/data_st.h	2015-11-10 13:50:27.428271277 -0800
9d123b58131d PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    11
+++ libpki-0.8.9/src/libpki/openssl/data_st.h	2016-02-05 10:23:52.741804145 -0800
9d123b58131d PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    12
@@ -425,7 +425,9 @@
9d123b58131d PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    13
 		int exponent;
9d123b58131d PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    14
 	} rsa;
9d123b58131d PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    15
 	// DSA scheme parameters
9d123b58131d PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    16
-	struct {} dsa;
9d123b58131d PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    17
+	struct {
9d123b58131d PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    18
+		int dummy;
9d123b58131d PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    19
+	} dsa;
9d123b58131d PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    20
 
9d123b58131d PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    21
 #ifdef ENABLE_ECDSA
9d123b58131d PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    22
 	// EC scheme parameters
9d123b58131d PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    23
--- libpki-0.8.9/src/pki_mem.c	2015-11-10 13:50:29.132816749 -0800
9d123b58131d PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    24
+++ libpki-0.8.9/src/pki_mem.c	2016-02-05 10:42:12.359660890 -0800
9d123b58131d PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    25
@@ -322,7 +322,10 @@
9d123b58131d PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    26
 	if (!pnt) return;
9d123b58131d PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    27
 
9d123b58131d PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    28
 	/* If No size is provided, normal PKI_Free() is used */
9d123b58131d PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    29
-	if ( size <= 0 ) return PKI_Free ( pnt );
9d123b58131d PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    30
+	if ( size <= 0 ) {
9d123b58131d PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    31
+		PKI_Free ( pnt );
9d123b58131d PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    32
+		return;
9d123b58131d PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    33
+	}
9d123b58131d PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    34
 
9d123b58131d PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    35
 	/* Zeroize the Memory */
9d123b58131d PSARC/2016/217 Smartcard Reintroduction
Jan Parcel <jan.parcel@oracle.com>
parents:
diff changeset
    36
 	memset( pnt, '\xFF', size );