Explicitly specify the types for make_pair when passing a const array

as the first value. Oddly, Sun Studio's default STL tries to make a
pair with the first value a 'const byte[2]', and then subsequently
rejects that as invalid. Reported by Jeremy Reed.

1 files changed, 10 insertions, 2 deletions

diff --git a/src/asn1/alg_id.cpp b/src/asn1/alg_id.cpp
index b48db3e50..665e42fb3 100644
--- a/src/asn1/alg_id.cpp
+++ b/src/asn1/alg_id.cpp
@@ -41,8 +41,12 @@ AlgorithmIdentifier::AlgorithmIdentifier(const OID& alg_id,
    const byte DER_NULL[] = { 0x05, 0x00 };
 
    oid = alg_id;
+
    if(option == USE_NULL_PARAM)
-      parameters += std::make_pair(DER_NULL, sizeof(DER_NULL));
+      {
+      parameters += std::make_pair<const byte*, size_t>(
+         DER_NULL, sizeof(DER_NULL));
+      }
    }
 
 /*
@@ -54,8 +58,12 @@ AlgorithmIdentifier::AlgorithmIdentifier(const std::string& alg_id,
    const byte DER_NULL[] = { 0x05, 0x00 };
 
    oid = OIDS::lookup(alg_id);
+
    if(option == USE_NULL_PARAM)
-      parameters += std::make_pair(DER_NULL, sizeof(DER_NULL));
+      {
+      parameters += std::make_pair<const byte*, size_t>(
+         DER_NULL, sizeof(DER_NULL));
+      }
    }
 
 /*