Changeset 745 for trunk/server/lib/util/data_blob.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• lib/util/data_blob.c (modified) (5 diffs)

trunk/server/lib/util/data_blob.c

@@ -34 +34 @@
 _PUBLIC_ DATA_BLOB data_blob_named(const void *p, size_t length, const char *name)
 {
+        return data_blob_talloc_named(NULL, p, length, name);
+}
+
+/**
+ construct a data blob, using supplied TALLOC_CTX
+**/
+_PUBLIC_ DATA_BLOB data_blob_talloc_named(TALLOC_CTX *mem_ctx, const void *p, size_t length, const char *name)
+{
         DATA_BLOB ret;
 
@@ -42 +50 @@
 
         if (p) {
-                ret.data = (uint8_t *)talloc_memdup(NULL, p, length);
+                ret.data = (uint8_t *)talloc_memdup(mem_ctx, p, length);
         } else {
-                ret.data = talloc_array(NULL, uint8_t, length);
+                ret.data = talloc_array(mem_ctx, uint8_t, length);
         }
         if (ret.data == NULL) {
@@ -52 +60 @@
         talloc_set_name_const(ret.data, name);
         ret.length = length;
-        return ret;
-}
-
-/**
- construct a data blob, using supplied TALLOC_CTX
-**/
-_PUBLIC_ DATA_BLOB data_blob_talloc_named(TALLOC_CTX *mem_ctx, const void *p, size_t length, const char *name)
-{
-        DATA_BLOB ret = data_blob_named(p, length, name);
-
-        if (ret.data) {
-                talloc_steal(mem_ctx, ret.data);
-        }
-        return ret;
-}
-
-
-/**
- reference a data blob, to the supplied TALLOC_CTX.  
- Returns a NULL DATA_BLOB on failure
-**/
-_PUBLIC_ DATA_BLOB data_blob_talloc_reference(TALLOC_CTX *mem_ctx, DATA_BLOB *blob)
-{
-        DATA_BLOB ret = *blob;
-
-        ret.data = talloc_reference(mem_ctx, blob->data);
-
-        if (!ret.data) {
-                return data_blob(NULL, 0);
-        }
         return ret;
 }
@@ -154 +132 @@
 print the data_blob as hex string
 **/
-_PUBLIC_ char *data_blob_hex_string(TALLOC_CTX *mem_ctx, const DATA_BLOB *blob)
+_PUBLIC_ char *data_blob_hex_string_lower(TALLOC_CTX *mem_ctx, const DATA_BLOB *blob)
 {
         int i;
@@ -174 +152 @@
 }
 
+_PUBLIC_ char *data_blob_hex_string_upper(TALLOC_CTX *mem_ctx, const DATA_BLOB *blob)
+{
+        int i;
+        char *hex_string;
+
+        hex_string = talloc_array(mem_ctx, char, (blob->length*2)+1);
+        if (!hex_string) {
+                return NULL;
+        }
+
+        for (i = 0; i < blob->length; i++)
+                slprintf(&hex_string[i*2], 3, "%02X", blob->data[i]);
+
+        hex_string[(blob->length*2)] = '\0';
+        return hex_string;
+}
+
 /**
   useful for constructing data blobs in test suites, while