scip/pcp
1
0
Fork 0
mirror of https://codeberg.org/scip/pcp.git synced 2025-12-17 12:00:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed pbp import

Browse Source
This commit is contained in:
TLINDEN
2014-01-28 20:05:46 +01:00
parent 3f1bfef581
commit 68d8f640e6
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/keymgmt.c
View File

@@ -401,14 +401,14 @@ int pcp_importpublic (vault_t *vault, FILE *in, int pbpcompat) {
goto errimp1;
}
char *parts = strtok (tmp, "|");
char *parts = strtok (tmp, "<>");
int pnum = 0;
while (parts != NULL) {
if(pnum == 0)
memcpy(pub->owner, parts, strlen(parts));
else if (pnum == 1)
memcpy(pub->mail, parts, strlen(parts));
parts = strtok(NULL, "|");
parts = strtok(NULL, "<>");
pnum++;
}
free(parts);

2
src/keyprint.c
View File

@@ -253,7 +253,7 @@ void pcppubkey_print(pcp_pubkey_t *key, FILE* out, int pbpcompat) {
v->tm_year+1900-1, v->tm_mon+1, v->tm_mday,
v->tm_hour, v->tm_min, v->tm_sec);
sprintf(name, "%s|%s", key->owner, key->mail);
sprintf(name, "%s<%s>", key->owner, key->mail);
memcpy(&raw[pos], dates, 64);
pos += 64;