Deleted Added
sdiff udiff text old ( 234010 ) new ( 262706 )
full compact
keydata.c (234010) keydata.c (262706)
1/*
1/*
2 * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC")
2 * Copyright (C) 2009, 2014 Internet Systems Consortium, Inc. ("ISC")
3 *
4 * Permission to use, copy, modify, and/or distribute this software for any
5 * purpose with or without fee is hereby granted, provided that the above
6 * copyright notice and this permission notice appear in all copies.
7 *
8 * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
9 * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
10 * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,

--- 35 unchanged lines hidden (view full) ---

46 dnskey->datalen = keydata->datalen;
47
48 if (mctx == NULL)
49 dnskey->data = keydata->data;
50 else {
51 dnskey->data = isc_mem_allocate(mctx, dnskey->datalen);
52 if (dnskey->data == NULL)
53 return (ISC_R_NOMEMORY);
3 *
4 * Permission to use, copy, modify, and/or distribute this software for any
5 * purpose with or without fee is hereby granted, provided that the above
6 * copyright notice and this permission notice appear in all copies.
7 *
8 * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
9 * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
10 * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,

--- 35 unchanged lines hidden (view full) ---

46 dnskey->datalen = keydata->datalen;
47
48 if (mctx == NULL)
49 dnskey->data = keydata->data;
50 else {
51 dnskey->data = isc_mem_allocate(mctx, dnskey->datalen);
52 if (dnskey->data == NULL)
53 return (ISC_R_NOMEMORY);
54 memcpy(dnskey->data, keydata->data, dnskey->datalen);
54 memmove(dnskey->data, keydata->data, dnskey->datalen);
55 }
56
57 return (ISC_R_SUCCESS);
58}
59
60isc_result_t
61dns_keydata_fromdnskey(dns_rdata_keydata_t *keydata,
62 dns_rdata_dnskey_t *dnskey,

--- 14 unchanged lines hidden (view full) ---

77
78 keydata->datalen = dnskey->datalen;
79 if (mctx == NULL)
80 keydata->data = dnskey->data;
81 else {
82 keydata->data = isc_mem_allocate(mctx, keydata->datalen);
83 if (keydata->data == NULL)
84 return (ISC_R_NOMEMORY);
55 }
56
57 return (ISC_R_SUCCESS);
58}
59
60isc_result_t
61dns_keydata_fromdnskey(dns_rdata_keydata_t *keydata,
62 dns_rdata_dnskey_t *dnskey,

--- 14 unchanged lines hidden (view full) ---

77
78 keydata->datalen = dnskey->datalen;
79 if (mctx == NULL)
80 keydata->data = dnskey->data;
81 else {
82 keydata->data = isc_mem_allocate(mctx, keydata->datalen);
83 if (keydata->data == NULL)
84 return (ISC_R_NOMEMORY);
85 memcpy(keydata->data, dnskey->data, keydata->datalen);
85 memmove(keydata->data, dnskey->data, keydata->datalen);
86 }
87
88 return (ISC_R_SUCCESS);
89}
86 }
87
88 return (ISC_R_SUCCESS);
89}