shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-01-10 05:18:30 +03:00
Code Issues Projects Releases Wiki Activity

core: Add allocating b64 checksum functions

Browse Source 
The checksum_b64_inplace variants can't be used in bindings. Provide
versions that allocate and return the output rather than working on a
passed in buffer. These can then be used in GI bindings to get the
ostree modified base64 encodings.

Closes: #398
Approved by: cgwalters
This commit is contained in:
Dan Nicholson 2016-07-14 09:09:12 -07:00 committed by Atomic Bot
parent 2e97e72123
commit db974b0596
4 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apidoc/ostree-sections.txt
View File

@ -99,6 +99,8 @@ ostree_checksum_inplace_from_bytes
ostree_checksum_inplace_to_bytes ostree_checksum_inplace_to_bytes
ostree_checksum_bytes_peek ostree_checksum_bytes_peek
ostree_checksum_bytes_peek_validate ostree_checksum_bytes_peek_validate
ostree_checksum_b64_from_bytes
ostree_checksum_b64_to_bytes
ostree_checksum_b64_inplace_from_bytes ostree_checksum_b64_inplace_from_bytes
ostree_checksum_b64_inplace_to_bytes ostree_checksum_b64_inplace_to_bytes
ostree_cmp_checksum_bytes ostree_cmp_checksum_bytes

5
src/libostree/libostree.sym
View File

@ -351,9 +351,8 @@ global:
* NOTE NOTE NOTE * NOTE NOTE NOTE
*/ */
/* UNCOMMENT WHEN ADDING THE FIRST NEW SYMBOL FOR 2016.8
LIBOSTREE_2016.8 { LIBOSTREE_2016.8 {
global: global:
insert_symbol_here; ostree_checksum_b64_to_bytes;
ostree_checksum_b64_from_bytes;
} LIBOSTREE_2016.7; } LIBOSTREE_2016.7;
*/

31
src/libostree/ostree-core.c
View File

@ -1272,6 +1272,20 @@ ostree_checksum_to_bytes_v (const char *checksum)
return ot_gvariant_new_bytearray ((guchar*)result, OSTREE_SHA256_DIGEST_LEN); return ot_gvariant_new_bytearray ((guchar*)result, OSTREE_SHA256_DIGEST_LEN);
} }
/**
* ostree_checksum_b64_to_bytes:
* @checksum: An ASCII checksum
*
* Returns: (transfer full) (array fixed-size=32): Binary version of @checksum.
*/
guchar *
ostree_checksum_b64_to_bytes (const char *checksum)
{
guchar *ret = g_malloc (32);
ostree_checksum_b64_inplace_to_bytes (checksum, ret);
return ret;
}
/** /**
* ostree_checksum_inplace_from_bytes: (skip) * ostree_checksum_inplace_from_bytes: (skip)
* @csum: (array fixed-size=32): An binary checksum of length 32 * @csum: (array fixed-size=32): An binary checksum of length 32
@ -1363,6 +1377,23 @@ ostree_checksum_from_bytes_v (GVariant *csum_v)
return ostree_checksum_from_bytes (ostree_checksum_bytes_peek (csum_v)); return ostree_checksum_from_bytes (ostree_checksum_bytes_peek (csum_v));
} }
/**
* ostree_checksum_b64_from_bytes:
* @csum: (array fixed-size=32): An binary checksum of length 32
*
* Returns: (transfer full): Modified base64 encoding of @csum
*
* The "modified" term refers to the fact that instead of '/', the '_'
* character is used.
*/
char *
ostree_checksum_b64_from_bytes (const guchar *csum)
{
char *ret = g_malloc (44);
ostree_checksum_b64_inplace_from_bytes (csum, ret);
return ret;
}
/** /**
* ostree_checksum_bytes_peek: * ostree_checksum_bytes_peek:
* @bytes: #GVariant of type ay * @bytes: #GVariant of type ay

4
src/libostree/ostree-core.h
View File

@ -192,6 +192,8 @@ guchar *ostree_checksum_to_bytes (const char *checksum);
_OSTREE_PUBLIC _OSTREE_PUBLIC
GVariant *ostree_checksum_to_bytes_v (const char *checksum); GVariant *ostree_checksum_to_bytes_v (const char *checksum);
_OSTREE_PUBLIC _OSTREE_PUBLIC
guchar *ostree_checksum_b64_to_bytes (const char *checksum);
_OSTREE_PUBLIC
void ostree_checksum_b64_inplace_to_bytes (const char *checksum, void ostree_checksum_b64_inplace_to_bytes (const char *checksum,
guint8 *buf); guint8 *buf);
@ -199,6 +201,8 @@ _OSTREE_PUBLIC
char * ostree_checksum_from_bytes (const guchar *csum); char * ostree_checksum_from_bytes (const guchar *csum);
_OSTREE_PUBLIC _OSTREE_PUBLIC
char * ostree_checksum_from_bytes_v (GVariant *csum_v); char * ostree_checksum_from_bytes_v (GVariant *csum_v);
_OSTREE_PUBLIC
char * ostree_checksum_b64_from_bytes (const guchar *csum);
_OSTREE_PUBLIC _OSTREE_PUBLIC
void ostree_checksum_inplace_from_bytes (const guchar *csum, void ostree_checksum_inplace_from_bytes (const guchar *csum,